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

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 3861be4aef67e40cc5e16b3b2997356a8e455cca
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Sun Nov 16 19:58:06 2008 +0100

    ogsmd: [TI CALYPSO] report GSM | GPRS cipher status

diff --git a/framework/subsystems/ogsmd/gsm/const.py b/framework/subsystems/ogsmd/gsm/const.py
index f68204f..1892375 100644
--- a/framework/subsystems/ogsmd/gsm/const.py
+++ b/framework/subsystems/ogsmd/gsm/const.py
@@ -803,6 +803,12 @@ NETWORK_USSD_MODE = { \
 }
 
 #=========================================================================#
+NETWORK_CIPHER_STATUS = { \
+    0: "disabled",
+    1: "enabled",
+}
+
+#=========================================================================#
 # PDU TP definitions follow here according to the appearance in GSM 03.40
 # chapter 9.2.3
 TP_MTI_INCOMING = { \
diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/unsolicited.py b/framework/subsystems/ogsmd/modems/ti_calypso/unsolicited.py
index 4c4674e..050cad9 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/unsolicited.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/unsolicited.py
@@ -7,7 +7,7 @@ The Open Device Daemon - Python Implementation
 GPLv2 or later
 """
 
-__version__ = "0.8.2"
+__version__ = "0.8.3"
 
 from framework.config import config
 from ogsmd.modems.abstract.unsolicited import AbstractUnsolicitedResponseDelegate
@@ -244,9 +244,10 @@ class UnsolicitedResponseDelegate( AbstractUnsolicitedResponseDelegate ):
 
     # %CPRI: 1,2
     def percentCPRI( self, righthandside ):
-        enabled, cipher = safesplit( righthandside, ',' )
-        logger.warning( "unhandled percentCPRI notice: %s" % righthandside )
-        # FIXME: self._object.EncryptionStatus ...
+        gsm, gprs = safesplit( righthandside, ',' )
+        cipher_gsm = const.NETWORK_CIPHER_STATUS.get( int(gsm), "unknown" )
+        cipher_gprs = const.NETWORK_CIPHER_STATUS.get( int(gprs), "unknown" )
+        self._object.CipherStatus( cipher_gsm, cipher_gprs )
 
     # %CSSN: 1,0,A11502010802013B300D04010F0408AA510C0683C16423
     def percentCSSN( self, righthandside ):
diff --git a/framework/subsystems/ogsmd/objects.py b/framework/subsystems/ogsmd/objects.py
index a6cf4b5..e692504 100644
--- a/framework/subsystems/ogsmd/objects.py
+++ b/framework/subsystems/ogsmd/objects.py
@@ -562,6 +562,10 @@ class Device( resource.Resource ):
     @dbus.service.signal( DBUS_INTERFACE_NETWORK, "ss" )
     def IncomingUssd( self, mode, message ):
         logger.info( "org.freesmartphone.GSM.Network.IncomingUssd: %s: %s", mode, message )
+
+    @dbus.service.signal( DBUS_INTERFACE_NETWORK, "ss" )
+    def CipherStatus( self, gsm, gprs ):
+        logger.info( "org.freesmartphone.GSM.Network.CypherStatus: %s: %s", gsm, gprs )
     #
     # dbus org.freesmartphone.GSM.Call
     #

-- 
FSO frameworkd Debian packaging