From: leslie <unknown>
Date: Sat, 19 Dec 2009 12:44:50 +0000 (+0100)
Subject: cardclient: don't delete client if initial login fails
X-Git-Tag: upstream/620~130
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=b6f4df738b8484b41cc3804e8e400d037994912f;p=sasc-ng.git

cardclient: don't delete client if initial login fails
---

diff --git a/systems/cardclient/aroureos.c b/systems/cardclient/aroureos.c
index 59eddd3..608f9c8 100644
--- a/systems/cardclient/aroureos.c
+++ b/systems/cardclient/aroureos.c
@@ -28,11 +28,10 @@
 class cCardClientAroureos : public cCardClient, protected cIdSet {
 private:
   bool ParseCardConfig(const char *config, int *num);
-protected:
-  virtual bool Login(void);
 public:
   cCardClientAroureos(const char *Name);
   virtual bool Init(const char *config);
+  virtual bool Login(void);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *source, unsigned char *cw, int cardnum);
   virtual bool ProcessEMM(int caSys, const unsigned char *source);
   };
diff --git a/systems/cardclient/camd.c b/systems/cardclient/camd.c
index 67a2ef5..e779aab 100644
--- a/systems/cardclient/camd.c
+++ b/systems/cardclient/camd.c
@@ -45,7 +45,6 @@ protected:
   char username[11], password[11];
   int emmReqLen;
   //
-  virtual bool Login(void);
   bool ParseKeyConfig(const char *config, int *num);
   bool ParseUserConfig(const char *config, int *num);
   virtual bool SendMsg(const unsigned char *data, int len);
@@ -55,6 +54,8 @@ protected:
 public:
   cCardClientCommon(const char *Name, bool ConReply, bool LogReply, bool DoAES, int MinMsgLen);
   virtual bool Init(const char *config);
+  virtual bool Login(void);
+  virtual bool Immediate(void);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *source, unsigned char *cw, int cardnum);
   virtual bool ProcessEMM(int caSys, const unsigned char *source);
   };
@@ -122,6 +123,11 @@ int cCardClientCommon::RecvMsg(unsigned char *data, int len, int to)
   return n;
 }
 
+bool cCardClientCommon::Immediate(void)
+{
+  return emmAllowed && logReply && cCardClient::Immediate();
+}
+
 bool cCardClientCommon::Init(const char *config)
 {
   cMutexLock lock(this);
@@ -130,7 +136,7 @@ bool cCardClientCommon::Init(const char *config)
   if(ParseStdConfig(config,&num) &&
      ParseUserConfig(config,&num) &&
      (!doAES || ParseKeyConfig(config,&num))) {
-    return (emmAllowed && logReply && Immediate()) ? Login() : true;
+    return true;
     }
   return false;
 }
@@ -321,11 +327,10 @@ cCardClientCardd::cCardClientCardd(const char *Name)
 class cCardClientBuffy : public cCardClientCommon {
 private:
   unsigned short CAIDs[MAX_CAIDS], numCAIDs;
-protected:
-  virtual bool Login(void);
 public:
   cCardClientBuffy(const char *Name);
   virtual bool Init(const char *config);
+  virtual bool Login(void);
   virtual bool CanHandle(unsigned short SysId);
   };
 
@@ -338,10 +343,7 @@ cCardClientBuffy::cCardClientBuffy(const char *Name)
 bool cCardClientBuffy::Init(const char *config)
 {
   cMutexLock lock(this);
-  if(cCardClientCommon::Init(config)) {
-    return Immediate() ? Login() : true;
-    }
-  return false;
+  return cCardClientCommon::Init(config);
 }
 
 bool cCardClientBuffy::CanHandle(unsigned short SysId)
@@ -431,7 +433,6 @@ protected:
   unsigned char Dx[8];
   int lastEmmReq;
   //
-  virtual bool Login(void);
   bool ParseUserConfig(const char *config, int *num);
   bool SendBlock(struct CmdBlock *cb, int datalen);
   int RecvBlock(struct CmdBlock *cb, int maxlen, int to);
@@ -440,6 +441,7 @@ protected:
 public:
   cCardClientCamd35(const char *Name);
   virtual bool Init(const char *config);
+  virtual bool Login(void);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *data, unsigned char *cw, int cardnum);
   virtual bool ProcessEMM(int caSys, const unsigned char *data);
   };
diff --git a/systems/cardclient/cc.c b/systems/cardclient/cc.c
index 3532e08..7e2909e 100644
--- a/systems/cardclient/cc.c
+++ b/systems/cardclient/cc.c
@@ -285,6 +285,7 @@ bool cSystemLinkCardClient::ParseLinePlain(const char *line)
         if(cc->Init(&line[num])) {
           Add(cc);
           PRINTF(L_CC_CORE,"client '%s' ready",cc->Name());
+          if(cc->Immediate()) cc->Login();
           return true;
           }
         else {
diff --git a/systems/cardclient/cc.h b/systems/cardclient/cc.h
index 1709546..645c46d 100644
--- a/systems/cardclient/cc.h
+++ b/systems/cardclient/cc.h
@@ -70,13 +70,13 @@ protected:
   bool ParseStdConfig(const char *config, int *num=0);
   virtual bool SendMsg(const unsigned char *data, int len);
   virtual int RecvMsg(unsigned char *data, int len, int to=-1);
-  virtual bool Login(void) { return false; }
   virtual void Logout(void);
-  bool Immediate(void);
   void CaidsChanged(void);
 public:
   cCardClient(const char *Name);
   virtual bool Init(const char *config)=0;
+  virtual bool Login(void)=0;
+  virtual bool Immediate(void);
   virtual bool CanHandle(unsigned short SysId);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *data, unsigned char *cw, int cardnum)=0;
   virtual bool ProcessEMM(int caSys, const unsigned char *data) { return false; }
diff --git a/systems/cardclient/cccam.c b/systems/cardclient/cccam.c
index 091729f..9f5cb52 100644
--- a/systems/cardclient/cccam.c
+++ b/systems/cardclient/cccam.c
@@ -168,12 +168,12 @@ private:
   int failedcw;
   char *socketpath;
 protected:
-  virtual bool Login(void);
   virtual void Action(void);
 public:
   cCardClientCCcam(const char *Name);
   ~cCardClientCCcam();
   virtual bool Init(const char *CfgDir);
+  virtual bool Login(void);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *data, unsigned char *Cw, int cardnum);
   };
 
@@ -205,7 +205,7 @@ bool cCardClientCCcam::Init(const char *config)
   PRINTF(L_CC_CORE,"%s: socket=%s",name,path);
   socketpath=strdup(path);
   for(int i=0; i<4; i++) card[i].Setup(i,socketpath);
-  return Immediate() ? Login() : true;
+  return true;
 }
 
 bool cCardClientCCcam::Login(void)
diff --git a/systems/cardclient/cccam2.c b/systems/cardclient/cccam2.c
index 617ba27..e724937 100644
--- a/systems/cardclient/cccam2.c
+++ b/systems/cardclient/cccam2.c
@@ -545,13 +545,13 @@ private:
   int CryptRecv(unsigned char *data, int len, int to=-1);
   bool CryptSend(const unsigned char *data, int len);
 protected:
-  virtual bool Login(void);
   virtual void Logout(void);
   virtual void Action(void);
 public:
   cCardClientCCcam2(const char *Name);
   ~cCardClientCCcam2();
   virtual bool Init(const char *CfgDir);
+  virtual bool Login(void);
   virtual bool CanHandle(unsigned short SysId);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *data, unsigned char *Cw, int cardnum);
   virtual bool ProcessEMM(int caSys, const unsigned char *data);
@@ -743,7 +743,7 @@ bool cCardClientCCcam2::Init(const char *config)
     for(unsigned int i=0; i<sizeof(nodeid); i++) nodeid[i]=rand();
   LDUMP(L_CC_CORE,nodeid,sizeof(nodeid),"our nodeid:");
   PRINTF(L_CC_CORE,"pretended CCcam version '%s' build '%s'",versstr,buildstr);
-  return Immediate() ? Login() : true;
+  return true;
 }
 
 void cCardClientCCcam2::Logout(void)
diff --git a/systems/cardclient/gbox.c b/systems/cardclient/gbox.c
index 07ffff9..558efdc 100644
--- a/systems/cardclient/gbox.c
+++ b/systems/cardclient/gbox.c
@@ -35,11 +35,10 @@
 class cCardClientGbox : public cCardClient { 
 private: 
   int GetMsg(int cmd, unsigned char *buff, int len);
-protected: 
-  virtual bool Login(void); 
 public: 
   cCardClientGbox(const char *Name); 
   virtual bool Init(const char *CfgDir); 
+  virtual bool Login(void);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *data, unsigned char *Cw, int cardnum);
   }; 
  
@@ -58,7 +57,7 @@ bool cCardClientGbox::Init(const char *config)
   Logout();
   int num=0;
   if(!ParseStdConfig(config,&num)) return false;
-  return Immediate() ? Login() : true; 
+  return true;
 } 
  
 bool cCardClientGbox::Login(void) 
diff --git a/systems/cardclient/newcamd.c b/systems/cardclient/newcamd.c
index 306ff10..d68a8f6 100644
--- a/systems/cardclient/newcamd.c
+++ b/systems/cardclient/newcamd.c
@@ -183,13 +183,12 @@ private:
   int ReceiveMessage(unsigned char *data, bool UseMsgId, struct CustomData *cd=0, comm_type_t commType=COMMTYPE_CLIENT);
   bool CmdSend(net_msg_type_t cmd,  comm_type_t commType=COMMTYPE_CLIENT);
   int CmdReceive(comm_type_t commType=COMMTYPE_CLIENT);
-protected:
-  virtual bool Login(void);
 public:
   cCardClientNewCamd(const char *Name);
   // 
   virtual bool Init(const char *CfgDir);
-  virtual bool CanHandle(unsigned short SysId);  
+  virtual bool Login(void);
+  virtual bool CanHandle(unsigned short SysId);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *data, unsigned char *Cw, int cardnum);
   virtual bool ProcessEMM(int caSys, const unsigned char *data);
   };
@@ -364,7 +363,7 @@ bool cCardClientNewCamd::Init(const char *config)
      || GetHex(tmp,configKey,sizeof(configKey),false)!=14) return false;
   char str[32];
   PRINTF(L_CC_CORE,"%s: username=%s password=%s key=%s",name,username,password,HexStr(str,configKey,14));
-  return Immediate() ? Login() : true;
+  return true;
 }
 
 bool cCardClientNewCamd::Login(void)
diff --git a/systems/cardclient/radegast.c b/systems/cardclient/radegast.c
index 3a71b21..5519d94 100644
--- a/systems/cardclient/radegast.c
+++ b/systems/cardclient/radegast.c
@@ -45,12 +45,11 @@ private:
   void AddNano(unsigned char *buff, int nano, int len, const unsigned char *data);
   bool Send(const unsigned char *buff);
   int Recv(unsigned char *buff, int len);
-protected:
-  virtual bool Login(void);
 public:
   cCardClientRadegast(const char *Name);
   virtual bool Init(const char *config);
-  virtual bool CanHandle(unsigned short SysId);  
+  virtual bool Login(void);
+  virtual bool CanHandle(unsigned short SysId);
   virtual bool ProcessECM(const cEcmInfo *ecm, const unsigned char *source, unsigned char *cw, int cardnum);
   virtual bool ProcessEMM(int caSys, const unsigned char *data);
   };
@@ -81,7 +80,7 @@ bool cCardClientRadegast::Init(const char *config)
 {
   cMutexLock lock(this);
   Logout();
-  return ParseStdConfig(config) && (Immediate() ? Login() : true);
+  return ParseStdConfig(config);
 }
 
 void cCardClientRadegast::SetLength(unsigned char *buff, int len)