From: leslie <unknown>
Date: Mon, 1 Jun 2009 10:33:35 +0000 (+0800)
Subject: cardclient-cccam: tune logging
X-Git-Tag: 0.9.2~25
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=8935bf930c064faa0830aa552eca0618a619e561;p=sasc-ng.git

cardclient-cccam: tune logging
---

diff --git a/network.c b/network.c
index 9e87911..c4b968e 100644
--- a/network.c
+++ b/network.c
@@ -147,7 +147,7 @@ int cNetWatcher::RunCommand(const char *cmd, const char *state)
 
 cNetSocket::cNetSocket(int ConnectTimeout, int ReadWriteTimeout, int IdleTimeout, bool Udp)
 {
-  hostname=0; sd=-1; connected=netup=false;
+  hostname=0; sd=-1; connected=netup=quietlog=false;
   udp=Udp; conTimeout=ConnectTimeout; rwTimeout=ReadWriteTimeout;
   idleTimeout=IdleTimeout*1000;
 }
@@ -210,7 +210,7 @@ bool cNetSocket::Connect(const char *Hostname, int Port, int timeout)
   nw.Unblock();
   struct sockaddr_in socketAddr;
   if(GetAddr(&socketAddr,hostname,port) && (sd=GetSocket(udp))>=0) {
-    PRINTF(L_CORE_NET,"connecting to %s:%d/%s (%d.%d.%d.%d)",
+    if(!quietlog) PRINTF(L_CORE_NET,"connecting to %s:%d/%s (%d.%d.%d.%d)",
                hostname,port,udp?"udp":"tcp",
                (socketAddr.sin_addr.s_addr>> 0)&0xff,(socketAddr.sin_addr.s_addr>> 8)&0xff,(socketAddr.sin_addr.s_addr>>16)&0xff,(socketAddr.sin_addr.s_addr>>24)&0xff);
     if(connect(sd,(struct sockaddr *)&socketAddr,sizeof(socketAddr))==0)
@@ -251,7 +251,7 @@ bool cNetSocket::Bind(const char *Hostname, int Port)
   nw.Unblock();
   struct sockaddr_in socketAddr;
   if(GetAddr(&socketAddr,hostname,port) && (sd=GetSocket(udp))>=0) {
-    PRINTF(L_CORE_NET,"socket: binding to %s:%d/%s (%d.%d.%d.%d)",
+    if(!quietlog) PRINTF(L_CORE_NET,"socket: binding to %s:%d/%s (%d.%d.%d.%d)",
                hostname,port,udp?"udp":"tcp",
                (socketAddr.sin_addr.s_addr>> 0)&0xff,(socketAddr.sin_addr.s_addr>> 8)&0xff,(socketAddr.sin_addr.s_addr>>16)&0xff,(socketAddr.sin_addr.s_addr>>24)&0xff);
     if(bind(sd,(struct sockaddr *)&socketAddr,sizeof(socketAddr))==0) {
@@ -345,7 +345,7 @@ int cNetSocket::Select(bool forRead, int timeout)
       return -1;
       }
     else {
-      if(timeout>0) PRINTF(L_CORE_NET,"socket: select timed out (%d secs)",timeout);
+      if(timeout>0 && !quietlog) PRINTF(L_CORE_NET,"socket: select timed out (%d secs)",timeout);
       return 0;
       }
     }
diff --git a/network.h b/network.h
index 713bbe6..5a01aac 100644
--- a/network.h
+++ b/network.h
@@ -43,7 +43,7 @@ private:
   int sd;
   char *hostname;
   int port, dummy, conTimeout, rwTimeout, idleTimeout;
-  bool udp, connected, netup;
+  bool udp, connected, netup, quietlog;
   cTimeMs activity;
   //
   int Select(bool forRead, int timeout);
@@ -61,6 +61,7 @@ public:
   int SendTo(const char *Host, int Port, const unsigned char *data, int len, int timeout=-1);
   void Flush(void);
   bool Connected(void) { return connected; }
+  void SetQuietLog(bool ql) { quietlog=ql; }
   };
 
 #endif //___NETWORK_H
diff --git a/systems/cardclient/cccam.c b/systems/cardclient/cccam.c
index 133ba7c..6f9612a 100644
--- a/systems/cardclient/cccam.c
+++ b/systems/cardclient/cccam.c
@@ -212,6 +212,7 @@ bool cCardClientCCcam::Login(void)
 {
   cMutexLock lock(this);
   so.Disconnect();
+  so.SetQuietLog(true);
   if(!so.Bind("127.0.0.1",port)) return false;
   PRINTF(L_CC_CCCAM,"Bound to port %d, starting UDP listener",port);
   Start();
@@ -321,6 +322,6 @@ void cCardClientCCcam::Action(void)
       if(cw[1]==0x0f && cw[0]<4)
         card[cw[0]].NewCw(cw+2);
       }
-    else PRINTF(L_CC_CCCAM,"unexpected read length r=%d",r);
+    else if(r>0) PRINTF(L_CC_CCCAM,"unexpected read length r=%d",r);
     }
 }