diff options
Diffstat (limited to 'net-p2p/dctc/files/patch-src:dc_manage.c')
| -rw-r--r-- | net-p2p/dctc/files/patch-src:dc_manage.c | 266 |
1 files changed, 266 insertions, 0 deletions
diff --git a/net-p2p/dctc/files/patch-src:dc_manage.c b/net-p2p/dctc/files/patch-src:dc_manage.c new file mode 100644 index 0000000..b33748a --- /dev/null +++ b/net-p2p/dctc/files/patch-src:dc_manage.c @@ -0,0 +1,266 @@ +--- src/dc_manage.c.orig Thu Nov 22 00:12:51 2001 ++++ src/dc_manage.c Thu Nov 22 00:13:13 2001 +@@ -35,6 +35,11 @@ + #include <fcntl.h> + #include <pthread.h> + ++#if (defined(BSD) && (BSD >= 199103)) ++#include <signal.h> ++#define MSG_NOSIGNAL 0 ++#endif ++ + #include "display.h" + #include "action.h" + #include "macro.h" +@@ -188,6 +193,9 @@ + /*************************/ + static int send_file_data(int sck,char *filename, int start_pos, unsigned long file_len,WAIT_ACT *act) + { ++#if (defined(BSD) && (BSD >= 199103)) ++ sigset_t sigset, sigoset; ++#endif + unsigned long int i; + char buf[8192]; + unsigned long int a=file_len-start_pos; +@@ -217,7 +225,20 @@ + goto abrt; + + act->last_touch=time(NULL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + res=send(sck,buf,sizeof(buf),MSG_NOSIGNAL|MSG_WAITALL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + act->last_touch=time(NULL); + if(res!=sizeof(buf)) + goto abrt; +@@ -232,8 +253,20 @@ + res=fread(buf,1,remain,f); + if(res!=remain) /* read error ? */ + goto abrt; +- ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + res=send(sck,buf,remain,MSG_NOSIGNAL|MSG_WAITALL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + if(res!=remain) + goto abrt; + } +@@ -250,6 +283,9 @@ + /*************************/ + static int send_array_data(int sck,GByteArray *ba,WAIT_ACT *act) + { ++#if (defined(BSD) && (BSD >= 199103)) ++ sigset_t sigset, sigoset; ++#endif + unsigned long int i; + unsigned long int nb; + int remain; +@@ -263,7 +299,20 @@ + for(i=0;i<nb;i++) + { + act->last_touch=time(NULL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + res=send(sck,ba->data+cur_pos,BLOCK_SIZE,MSG_NOSIGNAL|MSG_WAITALL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + act->last_touch=time(NULL); + if(res!=BLOCK_SIZE) + { +@@ -277,7 +326,20 @@ + disp_msg(DEBUG_MSG,"send_array_data","partial",NULL); + if(remain!=0) + { ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + res=send(sck,ba->data+cur_pos,remain,MSG_NOSIGNAL|MSG_WAITALL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + if(res!=remain) + goto abrt; + } +@@ -309,6 +371,9 @@ + /**************************************************************************/ + static int com_up_get_list_len_process(const char *cmd,WAIT_ACT *act,int sck,GString *input, char *xtra_param) + { ++#if (defined(BSD) && (BSD >= 199103)) ++ sigset_t sigset, sigoset; ++#endif + GByteArray *cpy_data; + GString *out; + int res; +@@ -337,8 +402,20 @@ + g_string_sprintfa(out,"%lu|",(unsigned long)cpy_data->len); + + disp_msg(INFO_MSG,"reply",out->str,NULL); +- ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + res=send(sck,out->str,out->len,MSG_NOSIGNAL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + res=(res!=out->len); + g_string_free(out,TRUE); + if(res) +@@ -362,7 +439,20 @@ + g_string_sprintfa(out,"%lu|",(unsigned long)100000+rand()%500000); + else + g_string_sprintfa(out,"%lu|",(unsigned long)cpy_data->len); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + res=send(sck,out->str,out->len,MSG_NOSIGNAL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + res=(res!=out->len); + g_string_free(out,TRUE); + if(res) +@@ -643,6 +733,9 @@ + /*****************************************************************/ + static int copie_fd_to_file(int remote, FILE *local, unsigned long amount,WAIT_ACT *act) + { ++#if (defined(BSD) && (BSD >= 199103)) ++ sigset_t sigset, sigoset; ++#endif + while(amount!=0) + { + char buf[8192]; +@@ -653,7 +746,20 @@ + + /* touch the action slot to avoid timeout */ + act->last_touch=time(NULL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + ret=recv(remote,buf,nb,MSG_WAITALL|MSG_NOSIGNAL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + act->last_touch=time(NULL); + + if((ret==-1)||(ret==0)) +@@ -983,6 +1089,9 @@ + /*****************************************************************/ + static int copie_fd_to_bytearray(int remote, GByteArray **ba, unsigned long amount,WAIT_ACT *act) + { ++#if (defined(BSD) && (BSD >= 199103)) ++ sigset_t sigset, sigoset; ++#endif + int pos=0; + int ret; + unsigned long nb; +@@ -996,12 +1105,25 @@ + + /* touch the action slot to avoid timeout */ + act->last_touch=time(NULL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + #if 0 + ret=recv(remote,(*ba)->data+pos,nb,MSG_WAITALL|MSG_NOSIGNAL); + #else + ret=recv(remote,(*ba)->data+pos,nb,MSG_NOSIGNAL); + printf("%d\n",ret); + #endif ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + act->last_touch=time(NULL); + + if((ret==-1)||(ret==0)) +@@ -2606,10 +2728,26 @@ + /*******************************************************/ + int manage_srch_port(int srch_sck, int sck) + { ++#if (defined(BSD) && (BSD >= 199103)) ++ sigset_t sigset, sigoset; ++#endif + char buf[8192]; + int ret; + ++#if (defined(BSD) && (BSD >= 199103)) ++ /* possible race condition since backup and restore ++ are not guaranteed to occur as a single operation */ ++ ++ /* backup sigmask and block SIGPIPE */ ++ sigemptyset(&sigset); ++ sigaddset(&sigset,SIGPIPE); ++ (void) sigprocmask(SIG_BLOCK, &sigset, &sigoset); ++#endif + ret=recv(srch_sck,buf,sizeof(buf),MSG_NOSIGNAL); ++#if (defined(BSD) && (BSD >= 199103)) ++ /* restore sigmask backup */ ++ (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); ++#endif + if(ret!=-1) + { + int i; |
