#include "notice.h"
#include "provider.h"
+#include <netinet/tcp.h> // TCP_NODELAY
+
#define SELF_PID (opm_provider.id)
#define OPM_READSIZE 128
}
break;
}
-#ifdef RB_IPV6
case AF_INET6:
{
struct sockaddr_in6 *s = (struct sockaddr_in6 *)&localaddr, *c = (struct sockaddr_in6 *)&auth->c_addr;
}
break;
}
-#endif
default:
warn_opers(L_CRIT, "OPM: unknown address type in listen function");
exit(EX_PROVIDER_ERROR);
goto end;
break;
-#ifdef RB_IPV6
case AF_INET6:
if(!proxy->ipv6)
/* Welp, too bad */
goto end;
break;
-#endif
default:
goto end;
}
memcpy(c, &(((struct sockaddr_in *)&scan->listener->addr)->sin_addr.s_addr), 4); c += 4; /* Address */
memcpy(c, &(((struct sockaddr_in *)&scan->listener->addr)->sin_port), 2); c += 2; /* Port */
break;
-#ifdef RB_IPV6
case AF_INET6:
*(c++) = '\x04'; /* Address type (4 = IPv6) */
memcpy(c, ((struct sockaddr_in6 *)&scan->listener->addr)->sin6_addr.s6_addr, 16); c += 16; /* Address */
memcpy(c, &(((struct sockaddr_in6 *)&scan->listener->addr)->sin6_port), 2); c += 2; /* Port */
break;
-#endif
default:
return;
}
static void
http_connect_connected(struct opm_scan *scan)
{
- struct auth_client *auth = scan->auth;
char sendbuf[128]; /* A bit bigger than we need but better safe than sorry */
- char *c = sendbuf;
/* Simple enough to build */
snprintf(sendbuf, sizeof(sendbuf), "CONNECT %s:%hu HTTP/1.0\r\n\r\n", scan->listener->ip, scan->listener->port);
lrb_assert(lookup != NULL);
-#ifdef RB_IPV6
if(GET_SS_FAMILY(&auth->c_addr) == AF_INET6)
{
if(proxy->proto == PROTO_SOCKS4)
listener = &listeners[LISTEN_IPV6];
}
else
-#endif
listener = &listeners[LISTEN_IPV4];
if(listener->F == NULL)
rb_fde_t *F;
int opt = 1;
- if(!rb_inet_pton_sock(ip, (struct sockaddr *)&addr))
+ if(!rb_inet_pton_sock(ip, &addr))
{
warn_opers(L_CRIT, "OPM: got a bad listener: %s:%hu", ip, port);
exit(EX_PROVIDER_ERROR);
SET_SS_PORT(&addr, htons(port));
-#ifdef RB_IPV6
if(GET_SS_FAMILY(&addr) == AF_INET6)
{
struct sockaddr_in6 *a1, *a2;
}
}
else
-#endif
{
struct sockaddr_in *a1, *a2;
opm_initiate(struct auth_client *auth, uint32_t provider)
{
struct opm_lookup *lookup = get_provider_data(auth, SELF_PID);
- uint32_t rdns_pid, ident_pid;
lrb_assert(provider != SELF_PID);
lrb_assert(!is_provider_done(auth, SELF_PID));
lrb_assert(rb_dlink_list_length(&proxy_scanners) > 0);
- if(lookup == NULL || lookup->in_progress)
+ if (lookup == NULL || lookup->in_progress) {
/* Nothing to do */
return;
- else if((!get_provider_id("rdns", &rdns_pid) || is_provider_done(auth, rdns_pid)) &&
- (!get_provider_id("ident", &ident_pid) || is_provider_done(auth, ident_pid)))
- /* Don't start until ident and rdns are finished (or not loaded) */
- return;
- else
+ } else if (run_after_provider(auth, "rdns") && run_after_provider(auth,"ident")) {
+ /* Start scanning if ident and rdns are finished, or not loaded. */
opm_scan(auth);
+ }
}
static bool
opm_start(struct auth_client *auth)
{
- uint32_t rdns_pid, ident_pid;
-
lrb_assert(get_provider_data(auth, SELF_PID) == NULL);
- if(!opm_enable || rb_dlink_list_length(&proxy_scanners) == 0)
+ if (!opm_enable || rb_dlink_list_length(&proxy_scanners) == 0) {
/* Nothing to do... */
+ provider_done(auth, SELF_PID);
return true;
+ }
auth_client_ref(auth);
set_provider_data(auth, SELF_PID, rb_malloc(sizeof(struct opm_lookup)));
- if((!get_provider_id("rdns", &rdns_pid) || is_provider_done(auth, rdns_pid)) &&
- (!get_provider_id("ident", &ident_pid) || is_provider_done(auth, ident_pid)))
- {
- /* Don't start until ident and rdns are finished (or not loaded) */
+ if (run_after_provider(auth, "rdns") && run_after_provider(auth, "ident")) {
+ /* Start scanning if ident and rdns are finished, or not loaded. */
opm_scan(auth);
}
- set_provider_running(auth, SELF_PID);
return true;
}
if(listeners[LISTEN_IPV4].F != NULL)
rb_close(listeners[LISTEN_IPV4].F);
-#ifdef RB_IPV6
if(listeners[LISTEN_IPV6].F != NULL)
rb_close(listeners[LISTEN_IPV6].F);
-#endif
memset(&listeners, 0, sizeof(listeners));
}