From: leslie <unknown>
Date: Sat, 25 Jul 2009 02:29:50 +0000 (+0800)
Subject: fix newcamd proto selection on reconnect
X-Git-Tag: 0.9.3~12
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=91ce899d03a05426c89f9526df00a19028fee760;p=sasc-ng.git

fix newcamd proto selection on reconnect
---

diff --git a/systems/cardclient/newcamd.c b/systems/cardclient/newcamd.c
index a12c966..4bd6555 100644
--- a/systems/cardclient/newcamd.c
+++ b/systems/cardclient/newcamd.c
@@ -172,7 +172,7 @@ private:
   unsigned char configKey[14];
   unsigned short netMsgId;
   int caId, protoVers, cdLen;
-  bool emmProcessing;
+  bool emmProcessing, loginOK;
   char username[USERLEN], password[PASSWDLEN];
   //
   void InitVars(void);
@@ -221,10 +221,12 @@ void cCardClientNewCamd::InitProtoVers(int vers)
     default:  protoVers=520; cdLen=4; break;
     }
   PRINTF(L_CC_NEWCAMD,"now using protocol version %d (cdLen=%d)",protoVers,cdLen);
+  loginOK=false;
 }
 
 bool cCardClientNewCamd::NextProto(void)
 {
+  if(loginOK) return false;
   switch(protoVers) {
     case 525: InitProtoVers(520); break;
     default:  return false;
@@ -466,6 +468,7 @@ bool cCardClientNewCamd::Login(void)
     if(emmProcessing && !emmAllowed)
       PRINTF(L_CC_EMM,"%s: EMM disabled from config",name);
     }
+  loginOK=true;
   return true;
 }