#include <netdb.h>
#include <string.h>
#include <strings.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include "../lib/sstring.h"
#include "../lib/irc_string.h"
int permit_count = 0;
int ping_handler(struct rline *ri, int argc, char **argv);
+static void nterfacer_sendcallback(struct rline *ri, int error, char *buf);
void _init(void) {
int loaded;
nrl = nterface_open_log("nterfacer", "logs/nterfacer.log", debug_mode);
loaded = load_permits();
- if(!loaded) {
- nterface_log(nrl, NL_ERROR, "No permits loaded successfully.");
+ nterface_log(nrl, NL_INFO, "Loaded %d permit%s successfully.", loaded, loaded==1?"":"s");
+
+ if(!loaded)
return;
- } else {
- nterface_log(nrl, NL_INFO, "Loaded %d permit%s successfully.", loaded, loaded==1?"":"s");
- }
nterfacer_events.on_accept = nterfacer_accept_event;
nterfacer_events.on_line = nterfacer_line_event;
}
void free_handler(struct handler *hp) {
+ struct rline *li, *pi = NULL;
+
+ for(li=rlines;li;) {
+ if(li->handler == hp) {
+ if(li->socket) {
+ esocket_write_line(li->socket, "%d,OE%d,%s", li->id, BF_UNLOADED, "Service was unloaded.");
+ } else if(li->callback) {
+ nterfacer_sendcallback(li, BF_UNLOADED, "Service was unloaded.");
+ }
+ if(pi) {
+ pi->next = li->next;
+ ntfree(li);
+ li = pi->next;
+ } else {
+ rlines = li->next;
+ ntfree(li);
+ li = rlines;
+ }
+ } else {
+ pi=li,li=li->next;
+ }
+ }
+
freesstring(hp->command);
ntfree(hp);
}
}
nrl = nterface_close_log(nrl);
+ nscheckfreeall(POOL_NTERFACER);
}
int load_permits(void) {
hostnamesa = getconfigitems("nterfacer", "hostname");
passwordsa = getconfigitems("nterfacer", "password");
- if(!hostnamesa || !passwordsa) {
- nterface_log(nrl, NL_ERROR, "Unable to load hostnames/passwords.");
+ if(!hostnamesa || !passwordsa)
return 0;
- }
if(hostnamesa->cursi != passwordsa->cursi) {
nterface_log(nrl, NL_ERROR, "Different number of hostnames/passwords in config file.");
return 0;
void deregister_service(struct service_node *service) {
struct service_node *sp, *lp = NULL;
- struct rline *li, *pi = NULL;
for(sp=tree;sp;lp=sp,sp=sp->next) {
if(sp == service) {
free_handlers(service);
- for(li=rlines;li;) {
- if(li->service == service) {
- if(pi) {
- pi->next = li->next;
- ntfree(li);
- li = pi->next;
- } else {
- rlines = li->next;
- ntfree(li);
- li = rlines;
- }
- } else {
- pi=li,li=li->next;
- }
- }
freesstring(service->name);
ntfree(service);
}
if(!item) {
- /* Someone needs to figure out how to print the IP :) */
- nterface_log(nrl, NL_INFO, "Unauthorised connection closed");
+ nterface_log(nrl, NL_INFO, "Unauthorised connection from %s closed", inet_ntoa(sin.sin_addr));
close(newfd);
return;
}
prequest->id = *number;
prequest->next = rlines;
prequest->socket = socket;
+ prequest->callback = NULL;
rlines = prequest;
re = (hl->function)(prequest, argcount, args);
/* not tested */
for(li=rlines;li;li=li->next)
- if(li->socket->tag == socket)
+ if(li->socket && (li->socket->tag == socket))
li->socket = NULL;
ntfree(socket);
va_list ap;
int retval = RE_OK;
- if(li->socket) {
+ if(li->socket || li->callback) {
va_start(ap, format);
vsnprintf(buf, sizeof(buf), format, ap);
va_end(ap);
for(tp=escapedbuf,p=buf;*p||(*tp='\0');*tp++=*p++)
if((*p == ',') || (*p == '\\'))
*tp++ = '\\';
+ if(li->socket) {
+ if(esocket_write_line(li->socket, "%d,OE%d,%s", li->id, error_code, escapedbuf))
+ retval = RE_SOCKET_ERROR;
+ } else {
+ if(error_code == 0) /* :P */
+ error_code = -10000;
- if(esocket_write_line(li->socket, "%d,OE%d,%s", li->id, error_code, escapedbuf))
- retval = RE_SOCKET_ERROR;
+ nterfacer_sendcallback(li, error_code, escapedbuf);
+ }
}
for(pp=rlines;pp;lp=pp,pp=pp->next) {
struct rline *pp, *lp = NULL;
int retval = RE_OK;
- if(li->socket)
+ if(li->socket) {
if(esocket_write_line(li->socket, "%d,OO%s", li->id, li->buf))
retval = RE_SOCKET_ERROR;
+ } else if(li->callback) {
+ nterfacer_sendcallback(li, 0, li->buf);
+ }
for(pp=rlines;pp;lp=pp,pp=pp->next) {
if(pp == li) {
ri_append(ri, "OK");
return ri_final(ri);
}
+
+void *nterfacer_sendline(char *service, char *command, int argc, char **argv, rline_callback callback, void *tag) {
+ struct service_node *servicep;
+ struct rline *prequest;
+ struct handler *hl;
+ int re;
+
+ for(servicep=tree;servicep;servicep=servicep->next)
+ if(!strcmp(servicep->name->content, service))
+ break;
+
+ if(!servicep) {
+ Error("nterfacer", ERR_WARNING, "sendline: service not found: %s", service);
+ return NULL;
+ }
+
+ for(hl=servicep->handlers;hl;hl=hl->next)
+ if(!strcmp(hl->command->content, command))
+ break;
+
+ if(!hl) {
+ Error("nterfacer", ERR_WARNING, "sendline: command not found: %s", command);
+ return NULL;
+ }
+
+ if(argc < hl->args) {
+ Error("nterfacer", ERR_WARNING, "sendline: wrong number of arguments: %s", command);
+ return NULL;
+ }
+
+ prequest = (struct rline *)ntmalloc(sizeof(struct rline));
+ if(!prequest) {
+ MemError();
+ return NULL;
+ }
+
+ prequest->service = servicep;
+ prequest->handler = hl;
+ prequest->buf[0] = '\0';
+ prequest->curpos = prequest->buf;
+ prequest->tag = tag;
+ prequest->id = 0;
+ prequest->next = rlines;
+ prequest->socket = NULL;
+ prequest->callback = callback;
+
+ rlines = prequest;
+ re = (hl->function)(prequest, argc, argv);
+
+ if(re) {
+ Error("nterfacer", ERR_WARNING, "sendline: error occured calling %s %d: %s", command, re, request_error(re));
+ return NULL;
+ }
+
+ return (void *)prequest;
+}
+
+void nterfacer_freeline(void *tag) {
+ struct rline *prequest = tag;
+
+ prequest->callback = NULL;
+}
+
+#define MAX_LINES 8192
+
+/* this bites */
+static void nterfacer_sendcallback(struct rline *ri, int error, char *buf) {
+ char *lines[MAX_LINES+1];
+ char newbuf[MAX_BUFSIZE+5];
+ char *s, *d, *laststart;
+ int linec = 0;
+
+ for(s=buf,laststart=d=newbuf;*s;s++) {
+ if((*s == '\\') && *(s + 1)) {
+ if(*(s + 1) == ',') {
+ *d++ = ',';
+ } else if(*(s + 1) == '\\') {
+ *d++ = '\\';
+ }
+ s++;
+ } else if(*s == ',') {
+ *d++ = '\0';
+ if(linec >= MAX_LINES - 5) {
+ nterfacer_sendcallback(ri, BF_OVER, "Buffer overflow.");
+ return;
+ }
+
+ lines[linec++] = laststart;
+ laststart = d;
+ } else {
+ *d++ = *s;
+ }
+ }
+ *d = '\0';
+ lines[linec++] = laststart;
+
+ ri->callback(error, linec, lines, ri->tag);
+}
projects / irc / quakenet / newserv.git / blobdiff