Changeset 1895

Timestamp:

03/25/10 00:07:39 (13 years ago)

Author:

_network

Message:

modular: resync with trunk

Location:

branches/modular

Files:

• globals.h (modified) (1 diff)
• module-cccam.c (modified) (7 diffs)
• module-dvbapi.c (modified) (1 diff)

branches/modular/globals.h

@@ -753 +753 @@
   uchar         locals_done;
   int       btun; // mark er as betatunneled
-  int       hops; // number of hops for CCCam
 
 #ifdef CS_WITH_GBOX

branches/modular/module-cccam.c

@@ -626 +626 @@
       pthread_mutex_unlock(&cc->ecm_busy);
   }
-  er->hops = cc->cur_card->hop + 1;
+
   return 0;
 }
@@ -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);
 }
 

branches/modular/module-dvbapi.c

@@ -1112 +1112 @@
             ecmtxt = fopen("/tmp/ecm.info", "w");
             if(ecmtxt != NULL) {
-                fprintf(ecmtxt, "caid 0x%04X\npid 0x%04X\nprov 0x%06X\n", er->caid, er->pid, (uint) er->prid);
+                fprintf(ecmtxt, "caid: 0x%04X\npid: 0x%04X\nprov: 0x%06X\n", er->caid, er->pid, (uint) er->prid);
                 fprintf(ecmtxt, "reader: %s\n", reader[er->reader[0]].label);
                 if (reader[er->reader[0]].typ & R_IS_CASCADING)