Changeset 6cac643 for dcc.c

Timestamp:

2008-04-14T12:59:15Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

b79308b

Parents:

2625d6d

Message:

more verbose error logging

File:

• dcc.c (modified) (4 diffs)

dcc.c

@@ -584 +584 @@
         file_transfer_t *ft;
         dcc_file_transfer_t *df;
-
-        if( regcomp( &re, pattern, REG_EXTENDED ) )
+        char errbuf[256];
+        int regerrcode, gret;
+
+        if( ( regerrcode = regcomp( &re, pattern, REG_EXTENDED ) ) ||
+            ( regerrcode = regexec( &re, line, 9, pmatch, 0 ) ) ) {
+                regerror( regerrcode,&re,errbuf,sizeof( errbuf ) );
+                imcb_log( ic, 
+                          "DCC: error parsing 'DCC SEND': %s, line: %s", 
+                          errbuf, line );
                 return NULL;
-        if( regexec( &re, line, 9, pmatch, 0 ) )
-                return NULL;
+        }
 
         if( ( pmatch[1].rm_so > 0 ) &&
@@ -616 +622 @@
                 if ( pmatch[5].rm_so > 0 )
                 {
-                        struct in_addr ipaddr = { htonl( atoi( input + pmatch[5].rm_so ) ) };
+                        struct in_addr ipaddr = { .s_addr = htonl( atoi( input + pmatch[5].rm_so ) ) };
                         host = inet_ntoa( ipaddr );
                 } else
@@ -631 +637 @@
 
                 memset( &hints, 0, sizeof ( struct addrinfo ) );
-                if ( getaddrinfo( host, port, &hints, &rp ) )
+                if ( ( gret = getaddrinfo( host, port, &hints, &rp ) ) )
                 {
                         g_free( input );
+                        imcb_log( ic, "DCC: getaddrinfo() failed with %s "
+                                  "when parsing incoming 'DCC SEND': "
+                                  "host %s, port %s", 
+                                  gai_strerror( gret ), host, port );
                         return NULL;
                 }
@@ -650 +660 @@
         }
 
+        imcb_log( ic, "DCC: couldnt parse 'DCC SEND' line: %s", line );
+
         return NULL;
 }