Daily patch: gateway

[kannel at kannel.org]

File gateway/ChangeLog changed from revision 1.3117 to 1.3118
File gateway/doc/userguide/userguide.xml changed from revision 1.357 to 1.358
File gateway/gw/bearerbox.c changed from revision 1.173 to 1.174
File gateway/gw/smsbox.c changed from revision 1.283 to 1.284
File gateway/gw/wapbox.c changed from revision 1.187 to 1.188
File gateway/gwlib/cfg.def changed from revision 1.141 to 1.142



Index: gateway/ChangeLog
diff -u gateway/ChangeLog:1.3117 gateway/ChangeLog:1.3118
--- gateway/ChangeLog:1.3117	Thu Dec  3 09:43:54 2009
+++ gateway/ChangeLog	Sun Dec  6 17:24:14 2009
@@ -1,3 +1,8 @@
+2009-12-06 Alexander Malysh <amalysh at kannel.org>
+    * doc/userguide/userguide.xml, gw/bearerbox.c, gw/smsbox.c, gw/wapbox.c, gwlib/cfg.def:
+      Applied patch that adds configurable http-timeout support for outgoing http client connections.
+      Thanks to Nikos Balkanas <nbal at amdtelecom.net> for this patch.
+
 2009-12-03 Alexander Malysh <amalysh at kannel.org>
     * gw/meta_data.c: fixed memory leak.
       Thanks to Nikos Balkanas <nbal at amdtelecom.net> for hint.
Index: gateway/doc/userguide/userguide.xml
diff -u gateway/doc/userguide/userguide.xml:1.357 gateway/doc/userguide/userguide.xml:1.358
--- gateway/doc/userguide/userguide.xml:1.357	Thu Sep 17 21:53:55 2009
+++ gateway/doc/userguide/userguide.xml	Sun Dec  6 17:24:14 2009
@@ -1557,6 +1557,13 @@
         </entry>   
      </row>
 
+    <row><entry><literal>http-timeout</literal></entry>
+     <entry>seconds</entry>
+     <entry valign="bottom">
+        Sets socket timeout in seconds for outgoing client http
+        connections. Optional. Defaults to 240 seconds.
+     </entry></row>
+
   </tbody>
   </tgroup>
  </table>
@@ -2155,11 +2162,16 @@
 	 is assumed.
 	 </entry></row>
 
+    <row><entry><literal>http-timeout</literal></entry>
+     <entry>seconds</entry>
+     <entry valign="bottom">
+        Sets socket timeout in seconds for outgoing client http
+        connections. Optional. Defaults to 240 seconds.
+     </entry></row>
   </tbody>
   </tgroup>
  </table>
 
-
 <programlisting>
 </programlisting>
 </sect2>
@@ -5734,6 +5746,12 @@
         </entry>
      </row>
 
+    <row><entry><literal>http-timeout</literal></entry>
+     <entry>seconds</entry>
+     <entry valign="bottom">
+        Sets socket timeout in seconds for outgoing client http
+        connections. Optional. Defaults to 240 seconds.
+     </entry></row>
   </tbody>
   </tgroup>
  </table>
Index: gateway/gw/bearerbox.c
diff -u gateway/gw/bearerbox.c:1.173 gateway/gw/bearerbox.c:1.174
--- gateway/gw/bearerbox.c:1.173	Wed Nov 11 16:50:54 2009
+++ gateway/gw/bearerbox.c	Sun Dec  6 17:24:14 2009
@@ -364,7 +364,7 @@
 {
     CfgGroup *grp;
     Octstr *log, *val;
-    long loglevel, store_dump_freq;
+    long loglevel, store_dump_freq, value;
     int lf, m;
 #ifdef HAVE_LIBSSL
     Octstr *ssl_server_cert_file;
@@ -514,6 +514,8 @@
     if (max_outgoing_sms_qlength < 0)
         max_outgoing_sms_qlength = DEFAULT_OUTGOING_SMS_QLENGTH;
 
+    if (cfg_get_integer(&value, grp, octstr_imm("http-timeout")) == 0)
+        http_set_client_timeout(value);
 #ifndef NO_SMS    
     {
         List *list;
Index: gateway/gw/smsbox.c
diff -u gateway/gw/smsbox.c:1.283 gateway/gw/smsbox.c:1.284
--- gateway/gw/smsbox.c:1.283	Wed May 20 10:12:46 2009
+++ gateway/gw/smsbox.c	Sun Dec  6 17:24:14 2009
@@ -3340,7 +3340,7 @@
     CfgGroup *grp;
     Octstr *logfile;
     Octstr *p;
-    long lvl;
+    long lvl, value;
     Octstr *http_proxy_host = NULL;
     long http_proxy_port = -1;
     int http_proxy_ssl = 0;
@@ -3540,6 +3540,9 @@
         max_req = HTTP_MAX_PENDING; 
     max_pending_requests = semaphore_create(max_req);
 
+    if (cfg_get_integer(&value, grp, octstr_imm("http-timeout")) == 0)
+       http_set_client_timeout(value);
+
     /*
      * Reading the name we are using for ppg services from ppg core group
      */
Index: gateway/gw/wapbox.c
diff -u gateway/gw/wapbox.c:1.187 gateway/gw/wapbox.c:1.188
--- gateway/gw/wapbox.c:1.187	Mon Jan 12 16:46:57 2009
+++ gateway/gw/wapbox.c	Sun Dec  6 17:24:14 2009
@@ -126,6 +126,7 @@
     Octstr *s;
     Octstr *logfile;
     int lf, m;
+    long value;
 
     lf = m = 1;
 
@@ -200,6 +201,9 @@
         octstr_destroy(s);
     }
 
+    if (cfg_get_integer(&value, grp, octstr_imm("http-timeout")) == 0)
+       http_set_client_timeout(value);
+
     /* configure the 'wtls' group */
 #if (HAVE_WTLS_OPENSSL)
     /* Load up the necessary keys */
Index: gateway/gwlib/cfg.def
diff -u gateway/gwlib/cfg.def:1.141 gateway/gwlib/cfg.def:1.142
--- gateway/gwlib/cfg.def:1.141	Tue Jun 23 07:19:58 2009
+++ gateway/gwlib/cfg.def	Sun Dec  6 17:24:14 2009
@@ -126,6 +126,7 @@
     OCTSTR(sms-resend-retry)
     OCTSTR(sms-combine-concatenated-mo)
     OCTSTR(sms-combine-concatenated-mo-timeout)
+    OCTSTR(http-timeout)
 )
 
 
@@ -159,6 +160,7 @@
     OCTSTR(concatenation)
     OCTSTR(max-messages)
     OCTSTR(wml-strict)
+    OCTSTR(http-timeout)
 )
 
 
@@ -280,6 +282,7 @@
     OCTSTR(black-list-regex)
     OCTSTR(immediate-sendsms-reply)
     OCTSTR(max-pending-requests)
+    OCTSTR(http-timeout)
 )