[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Daniel Willmann]

The following commit has been merged in the master branch:
commit 44764beab8db1ebc459d67540e7aa731232d82da
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Fri Nov 14 13:34:45 2008 +0100

    ogsmd: Increase default timeout to 10 seconds
    
    It seems that especially if the calypso is busy the default timeout of 5
    seconds wasn't enough and timeouts fired quite often with the response
    arriving shortly after. Increasing the timeout will hopefully only catch
    real timeouts.

diff --git a/framework/subsystems/ogsmd/gsm/channel.py b/framework/subsystems/ogsmd/gsm/channel.py
index 85c6cbd..79a644b 100644
--- a/framework/subsystems/ogsmd/gsm/channel.py
+++ b/framework/subsystems/ogsmd/gsm/channel.py
@@ -280,7 +280,7 @@ class QueuedVirtualChannel( VirtualChannel ):
         if "timeout" in kwargs:
             self.timeout = kwargs["timeout"]
         else:
-            self.timeout = 5 # default timeout in seconds
+            self.timeout = 10 # default timeout in seconds
 
         logger.info( "%s: Creating channel with timeout = %d seconds", self, self.timeout )
 
diff --git a/framework/subsystems/ogsmd/gsm/const.py b/framework/subsystems/ogsmd/gsm/const.py
index 4b73072..f68204f 100644
--- a/framework/subsystems/ogsmd/gsm/const.py
+++ b/framework/subsystems/ogsmd/gsm/const.py
@@ -76,10 +76,10 @@ def groupDictIfMatch( pattern, string ):
 
 #=========================================================================#
 TIMEOUT = { \
-  "SIMAUTH": 7,
+  "SIMAUTH": 10,
   "SIMACCESS": 10,
-  "NETWORK": 7,
-  "CFUN": 9,
+  "NETWORK": 10,
+  "CFUN": 10,
   "COPS": 30,
   "COPS=?": 80,
   "RING": 4,

-- 
FSO frameworkd Debian packaging