From c41d8a0a4b8006d73eb03587387d2061fdb02c73 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 25 Jan 2013 10:28:58 +1100 Subject: [PATCH] gsmd: allow multiple fields from a reponse to be logged. Signed-off-by: NeilBrown --- gsm/gsmd.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gsm/gsmd.py b/gsm/gsmd.py index 9d297f7..987e6ba 100644 --- a/gsm/gsmd.py +++ b/gsm/gsmd.py @@ -138,6 +138,8 @@ class AtAction(Task): channel.state['matched'] = True if self.record: record(self.record[0], m.expand(self.record[1])) + if len(self.record) > 3: + record(self.record[2], m.expand(self.record[3])) if self.handle: self.handle(channel, line, m) return @@ -620,8 +622,8 @@ control['init'] = [ AtAction(at='_OSQI=1', critical=False), AtAction(check='+CIMI', ok='(\d\d\d+)', record=('sim','\\1')), #_OSIMOP: "YES OPTUS","YES OPTUS","50502" - AtAction(check='_OSIMOP', ok='_OSIMOP: ".*",".*","(.*)"', - record=('sid','\\1'), critical=False), + AtAction(check='_OSIMOP', ok='_OSIMOP: "(.*)",".*","(.*)"', + record=('sid','\\2', 'carrier','\\1'), critical=False), # Make sure to use both 2G and 3G AtAction(at='_OPSYS=3,2', critical=False), -- 2.43.0