Changeset 1893

Timestamp:

03/24/10 19:13:43 (13 years ago)

Author:

_network

Message:

fix cccam module flooding log on error after restart.

File:

• trunk/module-cccam.c (modified) (6 diffs)

trunk/module-cccam.c

@@ -1128 +1128 @@
   if (cc==NULL) {
     cs_log("cccam: cannot allocate memory");
-    return -1;
+    cs_exit(0);
   }
 
@@ -1162 +1162 @@
     cc_crypt(&cc->block[DECRYPT], buf, 20, DECRYPT);
     cs_ddump(buf, 20, "cccam: hash:");
-  } else return -1;
+  } else {
+    cs_log("cccam:%d: receive failed errno: %d (%s)", __LINE__, errno, strerror(errno));
+    cs_exit(0);
+  }
 
   // receive username
@@ -1169 +1172 @@
     cs_ddump(buf, 20, "cccam: username '%s':", buf);
     strncpy(usr, (char *)buf, sizeof(usr));
-  } else return -1;
+  } else {
+    cs_log("cccam:%d: receive username failed errno: %d (%s)", __LINE__, errno, strerror(errno));
+    cs_exit(0);
+  }
 
   for (account=cfg->account; account; account=account->next)
@@ -1182 +1188 @@
     cc_crypt(&cc->block[DECRYPT], buf, 6, DECRYPT);
     cs_ddump(buf, 6, "cccam: pwd check '%s':", buf);
-  } else return -1;
+  } else {
+    cs_log("cccam:%d: receive passwd failed errno: %d (%s)", __LINE__, errno, strerror(errno));
+    cs_exit(0);
+  }
 
   cs_auth_client(account, NULL);
@@ -1204 +1213 @@
   cc_cmd_send(NULL, 0, MSG_CLI_DATA);
 
-  if (cc_send_srv_data()<0) return -1;
+  if (cc_send_srv_data()<0) {
+    cs_log("cccam:%d: cc_send_srv_data() failed errno: %d (%s)", __LINE__, errno, strerror(errno));
+    cs_exit(0);
+  }
 
   is_server = 1;
@@ -1244 +1256 @@
   //cc_auth_client(client[cs_idx].ip);
   cc_srv_connect();
+
+  
+  cs_exit(0);
 }