-/* vim: set shiftwidth=3 softtabstop=3 expandtab: */
-
/*
* Copyright (C) 2002-2003 Erik Fears
*
if (IRC_FD == -1)
{
- switch(errno)
- {
- case EINVAL:
- case EPROTONOSUPPORT:
- log_printf("IRC -> socket(): SOCK_STREAM is not "
- "supported on this domain");
- break;
- case ENFILE:
- log_printf("IRC -> socket(): Not enough free file "
- "descriptors to allocate IRC socket");
- break;
- case EMFILE:
- log_printf("IRC -> socket(): Process table overflow when "
- "requesting file descriptor");
- break;
- case EACCES:
- log_printf("IRC -> socket(): Permission denied to create "
- "socket of type SOCK_STREAM");
- break;
- case ENOMEM:
- log_printf("IRC -> socket(): Insufficient memory to "
- "allocate socket");
- break;
- default:
- log_printf("IRC -> socket(): Unknown error allocating "
- "socket");
- break;
- }
+ switch (errno)
+ {
+ case EINVAL:
+ case EPROTONOSUPPORT:
+ log_printf("IRC -> socket(): SOCK_STREAM is not supported on this domain");
+ break;
+ case ENFILE:
+ log_printf("IRC -> socket(): Not enough free file descriptors to allocate IRC socket");
+ break;
+ case EMFILE:
+ log_printf("IRC -> socket(): Process table overflow when requesting file descriptor");
+ break;
+ case EACCES:
+ log_printf("IRC -> socket(): Permission denied to create socket of type SOCK_STREAM");
+ break;
+ case ENOMEM:
+ log_printf("IRC -> socket(): Insufficient memory to allocate socket");
+ break;
+ default:
+ log_printf("IRC -> socket(): Unknown error allocating socket");
+ break;
+ }
- exit(EXIT_FAILURE);
- }
+ exit(EXIT_FAILURE);
+ }
- /* Bind */
- if (!EmptyString(IRCItem->vhost))
- {
- int bindret = 0;
+ /* Bind */
+ if (!EmptyString(IRCItem->vhost))
+ {
+ int bindret = 0;
- if (!inet_pton(AF_INET, IRCItem->vhost, &(IRC_LOCAL.in4.s_addr)))
- {
- log_printf("IRC -> bind(): %s is an invalid address", IRCItem->vhost);
- exit(EXIT_FAILURE);
- }
+ if (!inet_pton(AF_INET, IRCItem->vhost, &(IRC_LOCAL.in4.s_addr)))
+ {
+ log_printf("IRC -> bind(): %s is an invalid address", IRCItem->vhost);
+ exit(EXIT_FAILURE);
+ }
- bsaddr.sa4.sin_addr.s_addr = IRC_LOCAL.in4.s_addr;
- bsaddr.sa4.sin_family = AF_INET;
- bsaddr.sa4.sin_port = htons(0);
+ bsaddr.sa4.sin_addr.s_addr = IRC_LOCAL.in4.s_addr;
+ bsaddr.sa4.sin_family = AF_INET;
+ bsaddr.sa4.sin_port = htons(0);
- bindret = bind(IRC_FD, (struct sockaddr *) &(bsaddr.sa4), sizeof(bsaddr.sa4));
+ bindret = bind(IRC_FD, (struct sockaddr *) &(bsaddr.sa4), sizeof(bsaddr.sa4));
- if (bindret)
+ if (bindret)
+ {
+ switch (errno)
{
- switch(errno)
- {
- case EACCES:
- log_printf("IRC -> bind(): No access to bind to %s",
- IRCItem->vhost);
- break;
- default:
- log_printf("IRC -> bind(): Error binding to %s (%d)",
- IRCItem->vhost, errno);
- break;
- }
- exit(EXIT_FAILURE);
+ case EACCES:
+ log_printf("IRC -> bind(): No access to bind to %s", IRCItem->vhost);
+ break;
+ default:
+ log_printf("IRC -> bind(): Error binding to %s (%d)", IRCItem->vhost, errno);
+ break;
+ }
+
+ exit(EXIT_FAILURE);
}
}
}
static void
irc_read(void)
{
- int len;
- char c;
+ int len;
+ char c;
- while ((len = read(IRC_FD, &c, 1)) > 0)
- {
- if (c == '\r')
- continue;
+ while ((len = read(IRC_FD, &c, 1)) > 0)
+ {
+ if (c == '\r')
+ continue;
- if (c == '\n')
- {
- /* Null string. */
- IRC_RAW[IRC_RAW_LEN] = '\0';
- /* Parse line. */
- irc_parse();
- /* Reset counter. */
- IRC_RAW_LEN = 0;
- break;
- }
+ if (c == '\n')
+ {
+ /* Null string. */
+ IRC_RAW[IRC_RAW_LEN] = '\0';
- if (c != '\r' && c != '\n' && c != '\0')
- IRC_RAW[IRC_RAW_LEN++] = c;
- }
+ /* Parse line. */
+ irc_parse();
- if((len <= 0) && (errno != EAGAIN))
- {
- if(OPT_DEBUG >= 2)
- log_printf("irc_read -> errno=%d len=%d", errno, len);
- irc_reconnect();
+ /* Reset counter. */
IRC_RAW_LEN = 0;
- return;
- }
+ break;
+ }
+
+ if (c != '\r' && c != '\n' && c != '\0')
+ IRC_RAW[IRC_RAW_LEN++] = c;
+ }
+
+ if ((len <= 0) && (errno != EAGAIN))
+ {
+ if (OPT_DEBUG >= 2)
+ log_printf("irc_read -> errno=%d len=%d", errno, len);
+
+ irc_reconnect();
+ IRC_RAW_LEN = 0;
+ return;
+ }
}
/* irc_parse
static void
irc_parse(void)
{
- struct UserInfo *source_p;
- char *pos;
- unsigned int i;
-
- /*
- parv stores the parsed token, parc is the count of the parsed
- tokens
-
- parv[0] is ALWAYS the source, and is the server name of the source
- did not exist
- */
-
- static char *parv[17];
- static unsigned int parc;
- static char msg[MSGLENMAX]; /* Temporarily stores IRC msg to pass to handlers */
-
- parc = 1;
+ struct UserInfo *source_p;
+ char *pos;
- if(IRC_RAW_LEN <= 0)
- return;
-
- if (OPT_DEBUG >= 2)
- log_printf("IRC READ -> %s", IRC_RAW);
+ /*
+ * parv stores the parsed token, parc is the count of the parsed
+ * tokens
+ *
+ * parv[0] is ALWAYS the source, and is the server name of the source
+ * did not exist
+ */
+ static char *parv[17];
+ static unsigned int parc;
+ static char msg[MSGLENMAX]; /* Temporarily stores IRC msg to pass to handlers */
- time(&IRC_LAST);
+ parc = 1;
- /* Store a copy of IRC_RAW for the handlers (for functions that need PROOF) */
- strlcpy(msg, IRC_RAW, sizeof(msg));
+ if (IRC_RAW_LEN <= 0)
+ return;
- /* parv[0] is always the source */
- if(IRC_RAW[0] == ':')
- parv[0] = IRC_RAW + 1;
- else
- {
- parv[0] = IRCItem->server;
- parv[parc++] = IRC_RAW;
- }
+ if (OPT_DEBUG >= 2)
+ log_printf("IRC READ -> %s", IRC_RAW);
- pos = IRC_RAW;
+ time(&IRC_LAST);
- while((pos = strchr(pos, ' ')) && parc <= 17)
- {
+ /* Store a copy of IRC_RAW for the handlers (for functions that need PROOF) */
+ strlcpy(msg, IRC_RAW, sizeof(msg));
- /* Avoid excessive spaces and end of IRC_RAW */
- if(*(pos + 1) == ' ' && *(pos + 1) == '\0')
- {
- pos++;
- continue;
- }
+ /* parv[0] is always the source */
+ if (IRC_RAW[0] == ':')
+ parv[0] = IRC_RAW + 1;
+ else
+ {
+ parv[0] = IRCItem->server;
+ parv[parc++] = IRC_RAW;
+ }
- /* Anything after a : is considered the final string of the
- message */
- if(*(pos + 1) == ':')
- {
- parv[parc++] = pos + 2;
- *pos = '\0';
- break;
- }
+ pos = IRC_RAW;
- /* Set the next parv at this position and replace the space with a
- \0 for the previous parv */
- parv[parc++] = pos + 1;
- *pos = '\0';
+ while ((pos = strchr(pos, ' ')) && parc <= 17)
+ {
+ /* Avoid excessive spaces and end of IRC_RAW */
+ if (*(pos + 1) == ' ' && *(pos + 1) == '\0')
+ {
pos++;
- }
+ continue;
+ }
- /* Generate a UserInfo struct from the source */
+ /* Anything after a : is considered the final string of the message */
+ if (*(pos + 1) == ':')
+ {
+ parv[parc++] = pos + 2;
+ *pos = '\0';
+ break;
+ }
- source_p = userinfo_create(parv[0]);
+ /*
+ * Set the next parv at this position and replace the space with a
+ * \0 for the previous parv
+ */
+ parv[parc++] = pos + 1;
+ *pos = '\0';
+ pos++;
+ }
- /* Determine which command this is from the command table
- and let the handler for that command take control */
+ /* Generate a UserInfo struct from the source */
+ source_p = userinfo_create(parv[0]);
- for(i = 0; i < (sizeof(COMMAND_TABLE) / sizeof(struct CommandHash)); i++)
- if(strcasecmp(COMMAND_TABLE[i].command, parv[1]) == 0)
- {
- (*COMMAND_TABLE[i].handler)(parv, parc, msg, source_p);
- break;
- }
+ /*
+ * Determine which command this is from the command table
+ * and let the handler for that command take control
+ */
+ for (unsigned int i = 0; i < (sizeof(COMMAND_TABLE) / sizeof(struct CommandHash)); ++i)
+ {
+ if (strcasecmp(COMMAND_TABLE[i].command, parv[1]) == 0)
+ {
+ (*COMMAND_TABLE[i].handler)(parv, parc, msg, source_p);
+ break;
+ }
+ }
- userinfo_free(source_p);
+ userinfo_free(source_p);
}
/* irc_timer
get_channel(const char *channel)
{
node_t *node;
- struct ChannelConf *item;
LIST_FOREACH(node, IRCItem->channels->head)
{
- item = node->data;
+ struct ChannelConf *item = node->data;
if (strcasecmp(item->name, channel) == 0)
return item;
{ OPM_TYPE_ROUTER, "ROUTER" }
};
- for (unsigned i = 0; i < (sizeof(protocols) / sizeof(struct protocol_assoc)); ++i)
+ for (unsigned int i = 0; i < (sizeof(protocols) / sizeof(struct protocol_assoc)); ++i)
if (protocol == protocols[i].type)
return protocols[i].name;
Return:
None
*/
-
void
scan_init(void)
{
- node_t *p, *p2, *p3, *p4, *node;
-
- struct UserConf *uc;
- struct ScannerConf *sc;
- struct ProtocolConf *pc;
- struct scanner_struct *scs;
-
- char *mask;
- char *scannername;
+ node_t *p, *p2, *p3, *p4, *node;
+ struct UserConf *uc;
+ struct ScannerConf *sc;
+ struct ProtocolConf *pc;
+ struct scanner_struct *scs;
+ char *mask;
+ char *scannername;
- /* FIXME: If rehash code is ever added, cleanup would need done here. */
+ /* FIXME: If rehash code is ever added, cleanup would need done here. */
- SCANNERS = list_create();
- MASKS = list_create();
+ SCANNERS = list_create();
+ MASKS = list_create();
- /* Setup each individual scanner */
- LIST_FOREACH(p, ScannerItemList->head)
- {
- sc = p->data;
- scs = MyMalloc(sizeof *scs);
-
- if(OPT_DEBUG)
- log_printf("SCAN -> Setting up scanner [%s]", sc->name);
-
- /* Build the scanner */
- scs->scanner = opm_create();
- scs->name = xstrdup(sc->name);
- scs->masks = list_create();
-
- /* Setup configuration */
- opm_config(scs->scanner, OPM_CONFIG_FD_LIMIT, &(sc->fd));
- opm_config(scs->scanner, OPM_CONFIG_SCAN_IP, sc->target_ip);
- opm_config(scs->scanner, OPM_CONFIG_SCAN_PORT, &(sc->target_port));
- opm_config(scs->scanner, OPM_CONFIG_TIMEOUT, &(sc->timeout));
- opm_config(scs->scanner, OPM_CONFIG_MAX_READ, &(sc->max_read));
- opm_config(scs->scanner, OPM_CONFIG_BIND_IP, sc->vhost);
-
- /* add target strings */
- LIST_FOREACH(p2, sc->target_string->head)
+ /* Setup each individual scanner */
+ LIST_FOREACH(p, ScannerItemList->head)
+ {
+ sc = p->data;
+ scs = MyMalloc(sizeof *scs);
+
+ if (OPT_DEBUG)
+ log_printf("SCAN -> Setting up scanner [%s]", sc->name);
+
+ /* Build the scanner */
+ scs->scanner = opm_create();
+ scs->name = xstrdup(sc->name);
+ scs->masks = list_create();
+
+ /* Setup configuration */
+ opm_config(scs->scanner, OPM_CONFIG_FD_LIMIT, &(sc->fd));
+ opm_config(scs->scanner, OPM_CONFIG_SCAN_IP, sc->target_ip);
+ opm_config(scs->scanner, OPM_CONFIG_SCAN_PORT, &(sc->target_port));
+ opm_config(scs->scanner, OPM_CONFIG_TIMEOUT, &(sc->timeout));
+ opm_config(scs->scanner, OPM_CONFIG_MAX_READ, &(sc->max_read));
+ opm_config(scs->scanner, OPM_CONFIG_BIND_IP, sc->vhost);
+
+ /* add target strings */
+ LIST_FOREACH(p2, sc->target_string->head)
opm_config(scs->scanner, OPM_CONFIG_TARGET_STRING, (char *) p2->data);
- /* Setup callbacks */
- opm_callback(scs->scanner, OPM_CALLBACK_OPENPROXY, &scan_open_proxy, scs);
- opm_callback(scs->scanner, OPM_CALLBACK_NEGFAIL, &scan_negotiation_failed, scs);
- opm_callback(scs->scanner, OPM_CALLBACK_TIMEOUT, &scan_timeout, scs);
- opm_callback(scs->scanner, OPM_CALLBACK_END, &scan_end, scs);
- opm_callback(scs->scanner, OPM_CALLBACK_ERROR, &scan_handle_error, scs);
+ /* Setup callbacks */
+ opm_callback(scs->scanner, OPM_CALLBACK_OPENPROXY, &scan_open_proxy, scs);
+ opm_callback(scs->scanner, OPM_CALLBACK_NEGFAIL, &scan_negotiation_failed, scs);
+ opm_callback(scs->scanner, OPM_CALLBACK_TIMEOUT, &scan_timeout, scs);
+ opm_callback(scs->scanner, OPM_CALLBACK_END, &scan_end, scs);
+ opm_callback(scs->scanner, OPM_CALLBACK_ERROR, &scan_handle_error, scs);
+ /* Setup the protocols */
+ LIST_FOREACH(p2, sc->protocols->head)
+ {
+ pc = p2->data;
- /* Setup the protocols */
- LIST_FOREACH(p2, sc->protocols->head)
- {
- pc = p2->data;
+ if (OPT_DEBUG >= 2)
+ log_printf("SCAN -> Adding protocol %s:%d to scanner [%s]",
+ scan_gettype(pc->type), pc->port, scs->name);
- if(OPT_DEBUG >= 2)
- {
- log_printf("SCAN -> Adding protocol %s:%d to scanner [%s]",
- scan_gettype(pc->type), pc->port, scs->name);
- }
-
- if(opm_addtype(scs->scanner, pc->type, pc->port) == OPM_ERR_BADPROTOCOL)
- {
- log_printf("SCAN -> Error bad protocol %s:%d in scanner [%s]",
- scan_gettype(pc->type), pc->port, scs->name);
- }
- }
+ if (opm_addtype(scs->scanner, pc->type, pc->port) == OPM_ERR_BADPROTOCOL)
+ log_printf("SCAN -> Error bad protocol %s:%d in scanner [%s]",
+ scan_gettype(pc->type), pc->port, scs->name);
+ }
- node = node_create(scs);
- list_add(SCANNERS, node);
- }
+ node = node_create(scs);
+ list_add(SCANNERS, node);
+ }
+ /* Give scanners a list of masks they scan */
+ LIST_FOREACH(p, SCANNERS->head)
+ {
+ scs = p->data;
- /* Give scanners a list of masks they scan */
- LIST_FOREACH(p, SCANNERS->head)
- {
- scs = p->data;
+ LIST_FOREACH(p2, UserItemList->head)
+ {
+ uc = p2->data;
- LIST_FOREACH(p2, UserItemList->head)
+ LIST_FOREACH(p3, uc->scanners->head)
{
- uc = p2->data;
- LIST_FOREACH(p3, uc->scanners->head)
- {
- scannername = p3->data;
- /* Add all these masks to scanner */
- if(strcasecmp(scannername, scs->name) == 0)
- {
- LIST_FOREACH(p4, uc->masks->head)
- {
- mask = p4->data;
+ scannername = p3->data;
- if(OPT_DEBUG)
- {
- log_printf("SCAN -> Linking the mask [%s] to scanner "
- "[%s]", mask, scannername);
- }
+ /* Add all these masks to scanner */
+ if (strcasecmp(scannername, scs->name) == 0)
+ {
+ LIST_FOREACH(p4, uc->masks->head)
+ {
+ mask = p4->data;
- node = node_create(xstrdup(mask));
- list_add(scs->masks, node);
- }
- break;
- }
- }
+ if (OPT_DEBUG)
+ log_printf("SCAN -> Linking the mask [%s] to scanner [%s]", mask, scannername);
+
+ node = node_create(xstrdup(mask));
+ list_add(scs->masks, node);
+ }
+
+ break;
+ }
}
- }
+ }
+ }
- /* Initialise negative cache */
- if (OptionsItem->negcache > 0)
- {
- if(OPT_DEBUG >= 2)
- log_printf("SCAN -> Initializing negative cache");
- nc_init(&nc_head);
- }
+ /* Initialise negative cache */
+ if (OptionsItem->negcache > 0)
+ {
+ if (OPT_DEBUG >= 2)
+ log_printf("SCAN -> Initializing negative cache");
+
+ nc_init(&nc_head);
+ }
}
* Return: NONE
*
*/
-
-void scan_connect(char **user, char *msg)
+void
+scan_connect(char **user, char *msg)
{
+ struct bopm_sockaddr ip;
+ node_t *p, *p2;
+ struct scan_struct *ss;
+ struct scanner_struct *scs;
+ char *scsmask;
+ int ret;
- struct bopm_sockaddr ip;
-
- node_t *p, *p2;
- struct scan_struct *ss;
- struct scanner_struct *scs;
- char *scsmask;
- int ret;
-
- /*
- * Have to use MSGLENMAX here because it is unknown what the max size of
- * username/hostname can be. Some ircds use really mad values for
- * these.
- */
- static char mask[MSGLENMAX];
- static char ipmask[MSGLENMAX];
+ /*
+ * Have to use MSGLENMAX here because it is unknown what the max size of
+ * username/hostname can be. Some ircds use really mad values for
+ * these.
+ */
+ static char mask[MSGLENMAX];
+ static char ipmask[MSGLENMAX];
- /* Check negcache before anything */
- if(OptionsItem->negcache > 0)
- {
+ /* Check negcache before anything */
+ if (OptionsItem->negcache > 0)
+ {
if (!inet_pton(AF_INET, user[3], &(ip.sa4.sin_addr)))
{
log_printf("SCAN -> Invalid IPv4 address '%s'!", user[3]);
}
else
{
- if(check_neg_cache(ip.sa4.sin_addr.s_addr) != NULL)
+ if (check_neg_cache(ip.sa4.sin_addr.s_addr))
{
- if(OPT_DEBUG)
- {
+ if (OPT_DEBUG)
log_printf("SCAN -> %s!%s@%s (%s) is negatively cached. "
"Skipping all tests.", user[0], user[1], user[2],
user[3]);
- }
+
return;
}
}
snprintf(ipmask, MSGLENMAX, "%s!%s@%s", user[0], user[1], user[3]);
/* Check exempt list now that we have a mask */
- if(scan_checkexempt(mask, ipmask))
+ if (scan_checkexempt(mask, ipmask))
{
- if(OPT_DEBUG)
+ if (OPT_DEBUG)
log_printf("SCAN -> %s is exempt from scanning", mask);
return;
}
ss->remote->data = ss;
/* Start checking our DNSBLs */
- if(LIST_SIZE(OpmItem->blacklists) > 0)
+ if (LIST_SIZE(OpmItem->blacklists) > 0)
dnsbl_add(ss);
/* Add ss->remote to all matching scanners */
LIST_FOREACH(p2, scs->masks->head)
{
scsmask = p2->data;
- if(!match(scsmask, mask))
+ if (!match(scsmask, mask))
{
- if(OPT_DEBUG)
- {
+ if (OPT_DEBUG)
log_printf("SCAN -> Passing %s to scanner [%s]", mask,
scs->name);
- }
- if((ret = opm_scan(scs->scanner, ss->remote)) != OPM_SUCCESS)
+ if ((ret = opm_scan(scs->scanner, ss->remote)) != OPM_SUCCESS)
{
- switch(ret)
+ switch (ret)
{
case OPM_ERR_NOPROTOCOLS:
continue;
}
}
else
- ss->scans++; /* Increase scan count only if OPM_SUCCESS */
+ ++ss->scans; /* Increase scan count only if OPM_SUCCESS */
- break; /* Continue to next scanner */
+ break; /* Continue to next scanner */
}
}
}
- /* All scanners returned !OPM_SUCCESS and there were no dnsbl checks */
- if(ss->scans == 0)
- scan_free(ss);
+ /* All scanners returned !OPM_SUCCESS and there were no dnsbl checks */
+ if (ss->scans == 0)
+ scan_free(ss);
}
-
-
-
/* scan_create
*
- * Allocate scan struct, including user information and REMOTE
+ * Allocate scan struct, including user information and REMOTE
* for LIBOPM.
*
* Parameters:
* Return: Pointer to new scan_struct
*
*/
-
-struct scan_struct *scan_create(char **user, char *msg)
+struct scan_struct *
+scan_create(char **user, char *msg)
{
- struct scan_struct *ss;
-
- ss = MyMalloc(sizeof *ss);
+ struct scan_struct *ss = MyMalloc(sizeof *ss);
- ss->irc_nick = xstrdup(user[0]);
- ss->irc_username = xstrdup(user[1]);
- ss->irc_hostname = xstrdup(user[2]);
- ss->ip = xstrdup(user[3]);
- ss->proof = xstrdup(msg);
+ ss->irc_nick = xstrdup(user[0]);
+ ss->irc_username = xstrdup(user[1]);
+ ss->irc_hostname = xstrdup(user[2]);
+ ss->ip = xstrdup(user[3]);
+ ss->proof = xstrdup(msg);
- ss->remote = opm_remote_create(ss->ip);
- ss->scans = 0;
- ss->positive = 0;
-
- ss->manual_target = NULL;
+ ss->remote = opm_remote_create(ss->ip);
+ ss->scans = 0;
+ ss->positive = 0;
+ ss->manual_target = NULL;
- assert(ss->remote);
- return ss;
+ assert(ss->remote);
+ return ss;
}
/* scan_free
*
* Parameters:
* ss: scan_struct to free
- *
- * Return: NONE
*
+ * Return: NONE
*/
void
scan_free(struct scan_struct *ss)
*
* Check if a scan is complete (ss->scans <= 0)
* and free it if need be.
- *
*/
void
scan_checkfinished(struct scan_struct *ss)
{
- if(ss->scans <= 0)
- {
-
- if(ss->manual_target != NULL)
- {
- irc_send("PRIVMSG %s :CHECK -> All tests on %s completed.",
+ if (ss->scans <= 0)
+ {
+ if (ss->manual_target)
+ irc_send("PRIVMSG %s :CHECK -> All tests on %s completed.",
ss->manual_target->name, ss->ip);
- }
- else
- {
- if(OPT_DEBUG)
- {
- /* If there was a manual_target, then irc_nick, etc is NULL. */
- log_printf("SCAN -> All tests on %s!%s@%s complete.",
- ss->irc_nick, ss->irc_username, ss->irc_hostname);
- }
+ else
+ {
+ if (OPT_DEBUG)
+ /* If there was a manual_target, then irc_nick, etc is NULL. */
+ log_printf("SCAN -> All tests on %s!%s@%s complete.",
+ ss->irc_nick, ss->irc_username, ss->irc_hostname);
- /* Scan was a negative */
- if(!ss->positive)
- scan_negative(ss);
- }
+ /* Scan was a negative */
+ if (!ss->positive)
+ scan_negative(ss);
+ }
- scan_free(ss);
- }
+ scan_free(ss);
+ }
}
-
-
/* scan_positive
*
* Remote host (defined by ss) has been found positive by one or more
* tests.
*
* Parameters:
- * ss: scan_struct containing information regarding positive host
+ * ss: scan_struct containing information regarding positive host
* kline: command to send to IRC server to ban the user (see scan_irckline)
* type: string of the type of proxy found to be running on the host
*
* remote: Remote struct containing information regarding remote end
*
* Return: NONE
- *
*/
void
scan_open_proxy(OPM_T *scanner, OPM_REMOTE_T *remote, int notused, void *data)
{
- struct scan_struct *ss;
- struct scanner_struct *scs;
-
- /* Record that a scan happened */
- scan_log(remote);
-
- scs = data;
- ss = remote->data;
-
- if(ss->manual_target == NULL)
- {
- /* kline and close scan */
- scan_positive(ss, IRCItem->kline, scan_gettype(remote->protocol));
+ struct scan_struct *ss;
+ struct scanner_struct *scs;
- /* Report to blacklist */
- dnsbl_report(ss);
+ /* Record that a scan happened */
+ scan_log(remote);
- irc_send_channels("OPEN PROXY -> %s!%s@%s %s:%d (%s) [%s]",
- ss->irc_nick, ss->irc_username, ss->irc_hostname, remote->ip,
- remote->port, scan_gettype(remote->protocol), scs->name);
+ scs = data;
+ ss = remote->data;
- log_printf("SCAN -> OPEN PROXY %s!%s@%s %s:%d (%s) [%s]",
- ss->irc_nick, ss->irc_username, ss->irc_hostname, remote->ip,
- remote->port, scan_gettype(remote->protocol), scs->name);
- }
- else
- {
- irc_send("PRIVMSG %s :CHECK -> OPEN PROXY %s:%d (%s) [%s]",
- ss->manual_target->name, remote->ip, remote->port,
- scan_gettype(remote->protocol), scs->name);
+ if (ss->manual_target == NULL)
+ {
+ /* kline and close scan */
+ scan_positive(ss, IRCItem->kline, scan_gettype(remote->protocol));
- log_printf("SCAN -> OPEN PROXY %s:%d (%s) [%s]", remote->ip,
- remote->port, scan_gettype(remote->protocol), scs->name);
- }
+ /* Report to blacklist */
+ dnsbl_report(ss);
+ irc_send_channels("OPEN PROXY -> %s!%s@%s %s:%d (%s) [%s]",
+ ss->irc_nick, ss->irc_username, ss->irc_hostname, remote->ip,
+ remote->port, scan_gettype(remote->protocol), scs->name);
+ log_printf("SCAN -> OPEN PROXY %s!%s@%s %s:%d (%s) [%s]",
+ ss->irc_nick, ss->irc_username, ss->irc_hostname, remote->ip,
+ remote->port, scan_gettype(remote->protocol), scs->name);
+ }
+ else
+ {
+ irc_send("PRIVMSG %s :CHECK -> OPEN PROXY %s:%d (%s) [%s]",
+ ss->manual_target->name, remote->ip, remote->port,
+ scan_gettype(remote->protocol), scs->name);
+ log_printf("SCAN -> OPEN PROXY %s:%d (%s) [%s]", remote->ip,
+ remote->port, scan_gettype(remote->protocol), scs->name);
+ }
- /* Record the proxy for stats purposes */
- stats_openproxy(remote->protocol);
+ /* Record the proxy for stats purposes */
+ stats_openproxy(remote->protocol);
}
-
-
-
/* scan_negotiation_failed CALLBACK
*
* Called by libopm when negotiation of a specific protocol failed.
* Return: NONE
*
*/
-
-void scan_negotiation_failed(OPM_T *scanner, OPM_REMOTE_T *remote,
- int notused, void *data)
+void
+scan_negotiation_failed(OPM_T *scanner, OPM_REMOTE_T *remote, int notused, void *data)
{
-// struct scan_struct *ss;
- struct scanner_struct *scs;
+//struct scan_struct *ss;
+ struct scanner_struct *scs;
- /* Record that a scan happened */
- scan_log(remote);
+ /* Record that a scan happened */
+ scan_log(remote);
- scs = data;
-// ss = remote->data;
+ scs = data;
+//ss = remote->data;
- if(OPT_DEBUG)
- {
- log_printf("SCAN -> Negotiation failed %s:%d (%s) [%s] (%d bytes read)",
- remote->ip, remote->port, scan_gettype(remote->protocol),
- scs->name, remote->bytes_read);
- }
+ if (OPT_DEBUG)
+ log_printf("SCAN -> Negotiation failed %s:%d (%s) [%s] (%d bytes read)",
+ remote->ip, remote->port, scan_gettype(remote->protocol),
+ scs->name, remote->bytes_read);
/*
- if(ss->manual_target != NULL)
- {
- irc_send("PRIVMSG %s :CHECK -> Negotiation failed %s:%d (%s) [%s] "
- "(%d bytes read)", ss->manual_target->name, remote->ip,
- remote->port, scan_gettype(remote->protocol), scs->name,
- remote->bytes_read);
- }
+ if (ss->manual_target)
+ irc_send("PRIVMSG %s :CHECK -> Negotiation failed %s:%d (%s) [%s] "
+ "(%d bytes read)", ss->manual_target->name, remote->ip,
+ remote->port, scan_gettype(remote->protocol), scs->name,
+ remote->bytes_read);
*/
}
-
-
/* scan_timeout CALLBACK
*
* Called by libopm when the negotiation of a specific protocol timed out.
* Return: NONE
*
*/
-
-static void scan_timeout(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
- void *data)
+static void
+scan_timeout(OPM_T *scanner, OPM_REMOTE_T *remote, int notused, void *data)
{
-// struct scan_struct *ss;
- struct scanner_struct *scs;
+//struct scan_struct *ss;
+ struct scanner_struct *scs;
- /* Record that a scan happened */
- scan_log(remote);
+ /* Record that a scan happened */
+ scan_log(remote);
- scs = data;
-// ss = remote->data;
+ scs = data;
+//ss = remote->data;
- if(OPT_DEBUG)
- {
- log_printf("SCAN -> Negotiation timed out %s:%d (%s) [%s] "
- "(%d bytes read)", remote->ip, remote->port,
- scan_gettype(remote->protocol), scs->name,
- remote->bytes_read);
- }
+ if (OPT_DEBUG)
+ log_printf("SCAN -> Negotiation timed out %s:%d (%s) [%s] (%d bytes read)",
+ remote->ip, remote->port,
+ scan_gettype(remote->protocol), scs->name,
+ remote->bytes_read);
/*
- if(ss->manual_target != NULL)
- {
- irc_send("PRIVMSG %s :CHECK -> Negotiation timed out %s:%d (%s) [%s] "
- "(%d bytes read)", ss->manual_target->name, remote->ip,
- remote->port, scan_gettype(remote->protocol), scs->name,
- remote->bytes_read);
- }
+ if (ss->manual_target)
+ irc_send("PRIVMSG %s :CHECK -> Negotiation timed out %s:%d (%s) [%s] "
+ "(%d bytes read)", ss->manual_target->name, remote->ip,
+ remote->port, scan_gettype(remote->protocol), scs->name,
+ remote->bytes_read);
*/
}
-
-
/* scan_end CALLBACK
*
* Called by libopm when a specific SCAN has completed (all protocols in
* remote: Remote struct containing information regarding remote end
*
* Return: NONE
- *
*/
-
-static void scan_end(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
- void *data)
+static void
+scan_end(OPM_T *scanner, OPM_REMOTE_T *remote, int notused, void *data)
{
- struct scan_struct *ss;
- struct scanner_struct *scs;
+ struct scan_struct *ss;
+ struct scanner_struct *scs;
- scs = data;
- ss = remote->data;
+ scs = data;
+ ss = remote->data;
- if(OPT_DEBUG)
- log_printf("SCAN -> Scan %s [%s] completed", remote->ip, scs->name);
+ if (OPT_DEBUG)
+ log_printf("SCAN -> Scan %s [%s] completed", remote->ip, scs->name);
- ss->scans--;
- scan_checkfinished(ss);
+ --ss->scans;
+ scan_checkfinished(ss);
}
-
-
-
/* scan_handle_error CALLBACK
*
* Called by libopm when an error occurs with a specific connection. This
* err: OPM_ERROR code describing the error.
*
* Return: NONE
- *
*/
-
-static void scan_handle_error(OPM_T *scanner, OPM_REMOTE_T *remote,
- int err, void *data)
+static void
+scan_handle_error(OPM_T *scanner, OPM_REMOTE_T *remote, int err, void *data)
{
+ struct scan_struct *ss;
+ struct scanner_struct *scs;
- struct scan_struct *ss;
- struct scanner_struct *scs;
-
- scs = data;
- ss = remote->data;
+ scs = data;
+ ss = remote->data;
- switch(err)
- {
+ switch (err)
+ {
case OPM_ERR_MAX_READ:
- if(OPT_DEBUG >= 2)
- {
+ if (OPT_DEBUG >= 2)
log_printf("SCAN -> Max read on %s:%d (%s) [%s] (%d bytes read)",
remote->ip, remote->port, scan_gettype(remote->protocol),
scs->name, remote->bytes_read);
- }
- if(ss->manual_target != NULL)
- {
+ if (ss->manual_target)
irc_send("PRIVMSG %s :CHECK -> Negotiation failed %s:%d (%s) "
"[%s] (%d bytes read)", ss->manual_target->name,
remote->ip, remote->port, scan_gettype(remote->protocol),
scs->name, remote->bytes_read);
- }
+
break;
case OPM_ERR_BIND:
log_printf("SCAN -> Bind error on %s:%d (%s) [%s]", remote->ip,
"[%s]", remote->ip, remote->port,
scan_gettype(remote->protocol), scs->name);
- if(ss->manual_target != NULL)
- {
+ if (ss->manual_target)
irc_send("PRIVMSG %s :CHECK -> Scan failed %s:%d (%s) [%s] "
"(file descriptor allocation error)",
ss->manual_target->name, remote->ip, remote->port,
scan_gettype(remote->protocol), scs->name);
- }
break;
- default: /* Unknown Error! */
- if(OPT_DEBUG)
- {
- log_printf("SCAN -> Unknown error %s:%d (%s) [%s]", remote->ip,
+ default: /* Unknown Error! */
+ if (OPT_DEBUG)
+ log_printf("SCAN -> Unknown error %s:%d (%s) [%s]", remote->ip,
remote->port, scan_gettype(remote->protocol), scs->name);
- }
break;
- }
+ }
}
/* scan_negative
}
}
else
- ss->scans++; /* Increase scan count only if OPM_SUCCESS */
+ ++ss->scans; /* Increase scan count only if OPM_SUCCESS */
}
/*
}
}
-
-
/* scan_checkexempt
*
* Check mask against exempt list.
projects / hopm.git / commitdiff