[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 c8ff34f7756ae747fe5258177186d5962c1c5107
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Wed Dec 24 15:41:19 2008 +0100

    ogsmd: Catch up with latest act spec changes (make AcT mandatory)

diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index c412d41..124ec5e 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -1060,6 +1060,8 @@ class NetworkGetStatus( NetworkMediator ):
                     result["provider"] = values[2].strip( '"' ).decode(charset)
                     if len( values ) == 4:
                         result["act"] = const.REGISTER_ACT[int( values[3] )]
+                    else: # AcT defaults to GSM
+                        result["act"] = const.REGISTER_ACT[ 0 ]
                     values = safesplit( self._rightHandSide( response[-2] ), ',' )
                     if len( values ) > 2:
                         result["code"] = int( values[2].strip( '"' ).decode(charset) )
@@ -1107,7 +1109,7 @@ class NetworkListProviders( NetworkMediator ): # a{sv}
                 shortname = operator.groupdict()["shortname"].decode(charset)
                 act = operator.groupdict()["act"]
                 if act == "":
-                    act = "0" # Default to plain GSM
+                    act = "0" # AcT defaults to GSM
                 act = const.REGISTER_ACT[int(act)]
                 result.append( ( index, status, name, shortname, act ) )
             self._ok( result )
@@ -1448,6 +1450,8 @@ class PdpGetNetworkStatus( PdpMediator ):
                     result["cid"] = values[3].strip( '"' )
                 if len( values ) == 5:
                     result["act"] = const.REGISTER_ACT[ int(values[4]) ]
+                else: # AcT defaults to GSM
+                    result["act"] = const.REGISTER_ACT[ 0 ]
         self._ok( result )
 
 #=========================================================================#
diff --git a/framework/subsystems/ogsmd/modems/abstract/unsolicited.py b/framework/subsystems/ogsmd/modems/abstract/unsolicited.py
index 9422885..d7aea13 100644
--- a/framework/subsystems/ogsmd/modems/abstract/unsolicited.py
+++ b/framework/subsystems/ogsmd/modems/abstract/unsolicited.py
@@ -98,6 +98,8 @@ class AbstractUnsolicitedResponseDelegate( object ):
             status["cid"] = values[2].strip( '"' )
         if len( values ) == 4:
             status["act"] = const.REGISTER_ACT[int(values[3])]
+        else: # AcT defaults to GSM
+            status["act"] = const.REGISTER_ACT[ 0 ]
         self._object.NetworkStatus( status )
 
     # +CREG: 1,"000F","032F"
@@ -113,10 +115,11 @@ class AbstractUnsolicitedResponseDelegate( object ):
             self.cid = values[2].strip( '"' )
         if len( values ) == 4:
             self.act = const.REGISTER_ACT[int(values[3])]
+        else: # AcT defaults to GSM
+            self.act = const.REGISTER_ACT[ 0 ]
 
         self._mediator.NetworkGetStatus( self._object, self.statusOK, self.statusERR )
 
-
     # +CLIP: "+496912345678",145,,,,0
     def plusCLIP( self, righthandside ):
         """

-- 
FSO frameworkd Debian packaging