PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-20 22:49:01 +00:00
Code Issues Projects Releases Wiki Activity

Removed the proxy-specific tcp_connect hook.

Browse Source 
This simplifies the interface that proxies export to the library but also relies
upon the assumption that a proxy chain starts with a TCP connection from the
scanner to the next hop proxy. That will be enough ATM.
This commit is contained in:
henri
2013-04-22 19:31:40 +00:00
parent 4d5bb41361
commit ba27c10458
3 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nsock/src/nsock_connect.c
View File

@@ -270,7 +270,18 @@ nsock_event_id nsock_connect_tcp(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_hand
current = PROXY_CTX_CURRENT(nsi->px_ctx);
assert(current != NULL);
return current->ops->connect_tcp(nsp, ms_iod, handler, timeout_msecs, userdata, saddr, sslen, port);
memcpy(&nsi->px_ctx->target_ss, saddr, sslen);
nsi->px_ctx->target_sslen = sslen;
nsi->px_ctx->target_port = port;
nsi->px_ctx->target_handler = handler;
saddr = (struct sockaddr *)&current->ss;
sslen = current->sslen;
port = current->port;
handler = nsock_proxy_ev_dispatch;
return nsock_connect_tcp_direct(nsp, ms_iod, handler, timeout_msecs, userdata, saddr, sslen, port);
}
return nsock_connect_tcp_direct(nsp, ms_iod, handler, timeout_msecs, userdata, saddr, sslen, port);

3
nsock/src/nsock_proxy.h
View File

@@ -136,9 +136,6 @@ struct proxy_op {
void (*handler)(nsock_pool nspool, nsock_event nsevent, void *udata);
nsock_event_id (*connect_tcp)(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handler handler, int mstimeout,
void *userdata, struct sockaddr *saddr, size_t sslen, unsigned short port);
char *(*encode)(const char *src, size_t len, size_t *dlen);
char *(*decode)(const char *src, size_t len, size_t *dlen);
};

24
nsock/src/proxy_http.c
View File

@@ -72,9 +72,6 @@ static void proxy_http_node_delete(struct proxy_node *node);
static int proxy_http_info_new(void **info);
static void proxy_http_info_delete(void *info);
static void proxy_http_handler(nsock_pool nspool, nsock_event nsevent, void *udata);
static nsock_event_id proxy_http_connect_tcp(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handler handler,
int timeout_msecs, void *userdata, struct sockaddr *saddr,
size_t sslen, unsigned short port);
static char *proxy_http_encode(const char *src, size_t len, size_t *dlen);
static char *proxy_http_decode(const char *src, size_t len, size_t *dlen);
@@ -88,7 +85,6 @@ const struct proxy_op proxy_http_ops = {
.info_new = proxy_http_info_new,
.info_delete = proxy_http_info_delete,
.handler = proxy_http_handler,
.connect_tcp = proxy_http_connect_tcp,
.encode = proxy_http_encode,
.decode = proxy_http_decode
};
@@ -201,26 +197,6 @@ void proxy_http_handler(nsock_pool nspool, nsock_event nsevent, void *udata) {
}
}
nsock_event_id proxy_http_connect_tcp(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handler handler,
int timeout_msecs, void *userdata, struct sockaddr *saddr,
size_t sslen, unsigned short port) {
msiod *nsi = (msiod *)ms_iod;
struct proxy_node *current;
memcpy(&nsi->px_ctx->target_ss, saddr, sslen);
nsi->px_ctx->target_sslen = sslen;
nsi->px_ctx->target_port = port;
nsi->px_ctx->target_handler = handler;
current = PROXY_CTX_CURRENT(nsi->px_ctx);
saddr = (struct sockaddr *)&current->ss;
sslen = current->sslen;
port = current->port;
handler = nsock_proxy_ev_dispatch;
return nsock_connect_tcp_direct(nsp, ms_iod, handler, timeout_msecs, userdata, saddr, sslen, port);
}
char *proxy_http_encode(const char *src, size_t len, size_t *dlen) {
// TODO
return NULL;