netspool fixes

source/bforce/netspool.c

@@ -8,11 +8,10 @@
 #include <sys/types.h>
 #include <netdb.h>
 
+#include "includes.h"
 #include "netspool.h"
 
-const char *RHOST = "172.31.251.3";
-const char *RPORT = "24555";
-
+#ifdef NETSPOOL
 
 int readstr(int s, char *buf, int len) {
     char c=0;
@@ -99,7 +98,7 @@ void netspool_start(s_netspool_state *state, const char *host, const char *port,
 
     if( r ) {
 	state->state = NS_ERROR;
-	state->error = gai_error(r);
+	state->error = gai_strerror(r);
 	return;
     }
 
@@ -118,7 +117,7 @@ void netspool_start(s_netspool_state *state, const char *host, const char *port,
 
     if(r==-1) {
 	state->state = NS_ERROR;
-	state->error = "could not connect\n"
+	state->error = "could not connect";
 	return;
     }
 
@@ -139,7 +138,10 @@ void netspool_start(s_netspool_state *state, const char *host, const char *port,
 
 void netspool_query(s_netspool_state *state, const char *what)
 {
-    int r = sendstr(state->socket, "GET ALL");
+    char strbuf[STRBUF];
+    int r;
+    snprintf(strbuf, STRBUF, "GET %s", what); /* ALL or comma separated NETMAIL, ECHOMAIL... */
+    r = sendstr(state->socket, strbuf);
     if( r ) {
 	state->state = NS_ERROR;
 	state->error = "IO error";
@@ -153,7 +155,7 @@ void netspool_receive(s_netspool_state *state)
     char strbuf[STRBUF];
     int r;
 
-    r = readstr(s, strbuf, STRBUF);
+    r = readstr(state->socket, strbuf, STRBUF);
     if( r ) { state->state = NS_ERROR; state->error = "IO error"; return; }
     puts(strbuf);
     if(strcmp(strbuf, "QUEUE EMPTY")==0) {
@@ -162,15 +164,15 @@ void netspool_receive(s_netspool_state *state)
     }
 
     if(strncmp(strbuf, "FILENAME ", 9)==0) {
-        strcpy(filename, strbuf+9);
-        puts(filename);
+        strcpy(state->filename, strbuf+9);
+        puts(state->filename);
     } else {
 	state->state = NS_ERROR;
-	state->error = "expected filename or queue empty"
+	state->error = "expected filename or queue empty";
 	return;
     }
 
-    r = readstr(s, strbuf, STRBUF);
+    r = readstr(state->socket, strbuf, STRBUF);
     if( r ) { state->state = NS_ERROR; state->error = "IO error"; return; }
     if(strncmp(strbuf, "BINARY ", 7)==0) {
 	    /*if(filename[0]==0) {
@@ -182,7 +184,7 @@ void netspool_receive(s_netspool_state *state)
 	state->state = NS_RECVFILE;
     } else {
 	state->state = NS_ERROR;
-	state->error = "expected binary"
+	state->error = "expected binary";
 	return;
     }
 
@@ -265,3 +267,4 @@ void savefile(const char *fn, unsigned long long l, int s)
     close(f);
 }
 */
+#endif

source/bforce/prot_common.c

@@ -102,7 +102,9 @@ static int prot_get_next_file(s_filelist **dest, s_protinfo *pi)
 	/* network queue */
 #ifdef NETSPOOL
 
+	log("start netspool");
 	if(state.netspool.state == NS_NOTINIT) {
+	    log("netspool connection");
 	    char password[9];
 	    char address[300];
 	    char *host = conf_string(cf_netspool_host);
@@ -122,18 +124,23 @@ static int prot_get_next_file(s_filelist **dest, s_protinfo *pi)
 	    }
 	}
 
-	if(state.netspool_state == NS_READY) {
+	if(state.netspool.state == NS_READY) {
+	    log("netspool request");
 	    netspool_query(&state.netspool, "ALL");
 	}
 
-	if(state.netspool_state == NS_RECEIVING) {
+	if(state.netspool.state == NS_RECEIVING) {
+	    log("netspool begin receive");
 	    netspool_receive(&state.netspool);
 	}
 
-	if(state.netspool_state == NS_RECVFILE) {
+	if(state.netspool.state == NS_RECVFILE) {
+	    log("netspool start file");
 	    *dest = NULL;
 	    return 0;
 	}
+	
+	log("netspool gives no more files");
 
 #endif
 
@@ -292,7 +299,7 @@ get_next_file:
 	pi->send->action      = ptrl->action;
 	pi->send->flodsc      = ptrl->flodsc;
 
-#idef NETSPOOL
+#ifdef NETSPOOL
 	}
 #endif
 
@@ -435,8 +442,8 @@ int p_tx_fclose(s_protinfo *pi)
 				logerr("send: cannot truncate file \"%s\"", pi->send->fname);
 			break;
 #ifdef NETSPOOL
-		case ACTION_ACKNOWLEDE:
-			netspool_acknowlede(&state.netspool);
+		case ACTION_ACKNOWLEDGE:
+			netspool_acknowledge(&state.netspool);
 			break;
 #endif
 		}
@@ -465,8 +472,8 @@ int p_tx_readfile(char *buffer, size_t buflen, s_protinfo *pi)
 	long ftell_pos;
 
 #ifdef NETSPOOL
-	if(pi->send->fname==NULL && strcmp(pi->send->localname, "NETSPOOL")==0 ) {
-	    if( state->state != NS_RECVFILE ) {
+	if(pi->send->fname==NULL && strcmp(pi->send->local_name, "NETSPOOL")==0 ) {
+	    if( state.netspool.state != NS_RECVFILE ) {
 		log("send: wrong netspool state");
 		pi->send->status = FSTAT_SKIPPED;
 		return -2;
@@ -475,7 +482,7 @@ int p_tx_readfile(char *buffer, size_t buflen, s_protinfo *pi)
 	    pi->send->eofseen = state.netspool.length == 0;
 	    if( n==-1 ) {
 		log("send: netspool error");
-		log(netspool->state->error);
+		log(state.netspool.error);
 		pi->send->status = FSTAT_SKIPPED;
 		return -2;
 	    }
@@ -1278,6 +1285,9 @@ void p_session_cleanup(s_protinfo *pi, bool success)
 	}
 	
 #ifdef NETSPOOL
+	if(state.netspool.state==NS_ERROR) {
+	    log("netspool error %s", state.netspool.error);
+	}
 	netspool_end(&state.netspool);
 #endif
 }