Changes in trunk/src/sh_tools.c [18:30]

File:

• trunk/src/sh_tools.c (modified) (15 diffs)

trunk/src/sh_tools.c

@@ -127 +127 @@
   unsigned char c, d;
   const  char * p;
-  char   *q;
   char   tmp[4];
   char * outstr;
@@ -147 +146 @@
 
   p = instr;
-  q = outstr;
 
 #if !defined(SH_USE_XML)
@@ -441 +439 @@
 int DoReverseLookup = S_TRUE;
 
-int set_reverse_lookup (char * c)
+int set_reverse_lookup (const char * c)
 {
   return sh_util_flagval(c, &DoReverseLookup);
@@ -462 +460 @@
 
   int    retval;
+  size_t len;
 
   sin_cache * check_cache = conn_cache;
@@ -535 +534 @@
                   else
                     {
-                      host_name = SH_ALLOC(sl_strlen(host_entry->h_name) + 1);
-                      if (sl_strlen(host_entry->h_name) > 0)
-                        strcpy(host_name,                /* known to fit  */
-                               host_entry->h_name);
+                      len = sl_strlen(host_entry->h_name) + 1;
+                      host_name = SH_ALLOC(len);
+                      if (len > 1)
+                        sl_strlcpy(host_name, host_entry->h_name, len);
                       else
                         host_name[0] = '\0';
@@ -694 +693 @@
 }
 
-#if defined(HAVE_NTIME) || defined(SH_WITH_CLIENT)
+#if defined(HAVE_NTIME) || defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
 static
 int sh_write_select(int type, int sockfd, 
@@ -714 +713 @@
    */
   new_act.sa_handler = SIG_IGN;
+  sigemptyset( &new_act.sa_mask );         /* set an empty mask       */
+  new_act.sa_flags = 0;                    /* init sa_flags           */
   sigaction (SIGPIPE, &new_act, &old_act);
   
@@ -839 +840 @@
 #endif
 
-#if defined (SH_WITH_CLIENT)
+#if defined (SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
 unsigned long write_port (int sockfd, char *buf, unsigned long nbytes, 
                           int * w_error, int timeout)
@@ -859 +860 @@
 #endif
 
-#if defined(HAVE_NTIME) || defined(SH_WITH_CLIENT)
+#if defined(HAVE_NTIME) || defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
 
 unsigned long read_port (int sockfd, char *buf, unsigned long nbytes, 
@@ -895 +896 @@
 #endif
 
-#if defined (SH_WITH_CLIENT)
+#if defined (SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
 
 int check_request (char * have, char * need)
@@ -949 +950 @@
 #endif
 
-#if defined (SH_WITH_CLIENT)
+#if defined (SH_WITH_CLIENT) || defined (SH_WITH_SERVER)
 
 void get_header (unsigned char * head, unsigned long * bytes, char * u)
@@ -1029 +1030 @@
  * (msg_size = payload_size - key_len = payload_size - 48)
  */ 
+
+/* 
+ * only SH_V2_FULLSIZE is used, and only once
+ */
+#if 0
 #ifdef SH_WITH_SERVER
 #define SH_V2_FULLSIZE  240
@@ -1038 +1044 @@
 #define SH_V2_MESSAGE   960
 #endif
+#endif
+#define SH_V2_FULLSIZE 1024
 
 #ifdef SH_ENCRYPT
@@ -1380 +1388 @@
 #endif
 
-#if defined (SH_WITH_CLIENT)
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
 
 /* verify the checksum of a buffer; checksum comes first
@@ -1532 +1540 @@
 #endif
 
-#if defined(SH_WITH_CLIENT) || defined(SH_STEALTH) || defined(WITH_GPG) || defined(WITH_PGP)
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER) || defined(SH_STEALTH) || defined(WITH_GPG) || defined(WITH_PGP)
 
 /* --------- secure temporary file ------------ */