Changeset 1228 for branches/monitor-improvement/module-cccam.c

Timestamp:

01/14/10 19:07:30 (13 years ago)

Author:

alno

Message:

WebIf:

• Command: Merging revisions 1212-1227 of trunk

File:

• branches/monitor-improvement/module-cccam.c (modified) (9 diffs)

branches/monitor-improvement/module-cccam.c

@@ -165 +165 @@
 
 #define SWAPC(X, Y) do { char p; p = *X; *X = *Y; *Y = p; } while(0)
-#define X_FREE(X) do { if (X) { free(X); X = NULL; } } while(0)
+#define NULLFREE(X) do { if (X) { free(X); X = NULL; } } while(0)
 
 #if (defined(WIN32) || defined(OS_CYGWIN32)) && !defined(MSG_WAITALL)
@@ -383 +383 @@
   n = send(client[cs_idx].udp_fd, netbuf, len, 0);
 
-  X_FREE(netbuf);
+  NULLFREE(netbuf);
 
   return n;
@@ -548 +548 @@
     n = cc_cmd_send(ecmbuf, cur_er->l+13, MSG_ECM);      // send ecm
 
-    X_FREE(ecmbuf);
+    NULLFREE(ecmbuf);
   } else {
     n = -1;
@@ -742 +742 @@
 {
   int n;
+  uchar *cbuf;
   struct cc_data *cc = reader[ridx].cc;
-  uchar *cbuf = malloc(l);
+
+  if (buf==NULL) return -1;
+  cbuf = malloc(l);
+  if (cbuf==NULL) return -1;
 
   memcpy(cbuf, buf, l);   // make a copy of buf
@@ -756 +760 @@
   }
 
-  cs_ddump(buf, n, "cccam: received %d bytes from %s", n, remote_txt());
+  cs_ddump(cbuf, n, "cccam: received %d bytes from %s", n, remote_txt());
   client[cs_idx].last = time((time_t *) 0);
 
-  if (n < 4) {
+  if (n == 0) {
+    cs_log("cccam: Connection closed to %s", remote_txt());
+    n = -1;
+  } else if (n < 4) {
     cs_log("cccam: packet to small (%d bytes)", n);
     n = -1;
-  } else if (n == 0) {
-    cs_log("cccam: Connection closed to %s", remote_txt());
-    n = -1;
-  }
-
-  cc_parse_msg(cbuf, n);
-
-  memcpy(buf, cbuf, l);
-
-  X_FREE(cbuf);
+  } else {
+    // parse it and write it back, if we have received something of value
+    cc_parse_msg(cbuf, n);
+    memcpy(buf, cbuf, l);
+  }
+
+  NULLFREE(cbuf);
 
   pthread_mutex_unlock(&cc->lock);
@@ -784 +788 @@
   uint8 hash[SHA_DIGEST_LENGTH];
   uint8 buf[CC_MAXMSGSIZE];
+  char pwd[64];
   struct cc_data *cc;
+
+  if (reader[ridx].cc) NULLFREE(reader[ridx].cc);
 
   // init internals data struct
   cc = malloc(sizeof(struct cc_data));
+  if (cc==NULL) {
+    cs_log("cccam: cannot allocate memory");
+    return -1;
+  }
   reader[ridx].cc = cc;
   bzero(reader[ridx].cc, sizeof(struct cc_data));
@@ -827 +838 @@
 
   bzero(buf, sizeof(buf));
-
   memcpy(buf, reader[ridx].r_usr, strlen(reader[ridx].r_usr));
   cs_ddump(buf, 20, "cccam: username '%s':", buf);
@@ -833 +843 @@
 
   bzero(buf, sizeof(buf));
+  bzero(pwd, sizeof(pwd));
 
   cs_debug("cccam: 'CCcam' xor");
   memcpy(buf, "CCcam", 5);
-  cc_crypt(&cc->block[ENCRYPT], (uint8 *)reader[ridx].r_pwd, strlen(reader[ridx].r_pwd), ENCRYPT);     // modify encryption state w/ pwd
+  strncpy(pwd, reader[ridx].r_pwd, 63);
+  cc_crypt(&cc->block[ENCRYPT], (uint8 *)pwd, strlen(pwd), ENCRYPT);
   cc_cmd_send(buf, 6, MSG_NO_HEADER); // send 'CCcam' xor w/ pwd
 
@@ -925 +937 @@
     bcopy((char *)server->h_addr, (char *)&client[cs_idx].udp_sa.sin_addr.s_addr, server->h_length);
 
-    reader[ridx].tcp_rto = 60 * 60 * 10;  // timeout to 10 hours
+    if (reader[ridx].tcp_rto <= 0) reader[ridx].tcp_rto = 60 * 60 * 10;  // timeout to 10 hours
+    cs_debug("cccam: reconnect timeout set to: %d", reader[ridx].tcp_rto);
     if (!reader[ridx].cc_maxhop) reader[ridx].cc_maxhop = 10; // default maxhop to 10 if not configured