Changeset 3987

Timestamp:

11/24/10 23:07:35 (13 years ago)

Author:

schlocke

Message:

cccam: fixed connection lost/reset/dups

Location:

trunk

Files:

• module-cccam.c (modified) (5 diffs)
• oscam-simples.c (modified) (3 diffs)

trunk/module-cccam.c

@@ -212 +212 @@
             close(cl->udp_fd);
         cl->udp_fd = 0;
+        cl->pfd = 0;
     }
 
@@ -3115 +3116 @@
                     break; //Disconnect client
                 }
-                else
+                else if (cc->extended_mode) //special handling for "oscam"-cccam clients:
                 {
                     if (cc_cmd_send(cl, NULL, 0, MSG_KEEPALIVE) < 0)
@@ -3179 +3180 @@
         cs_log("cccam: %d failed errno: %d (%s)", __LINE__, errno, strerror(
                 errno));
-    cs_disconnect_client(cl);
-    if (cl->udp_fd) {
-        close(cl->udp_fd);
-        cl->udp_fd = 0;
-        cl->pfd = 0;
-    }
     cc_cleanup(cl);
     cs_debug_mask(D_FUT, "cc_srv_init out");
+    cs_disconnect_client(cl);
     return NULL; //suppress compiler warning
 }
@@ -3235 +3231 @@
     if ((n = recv(handle, data, 16, MSG_WAITALL)) != 16) {
         int err = errno;
-        cs_log(
-                "%s server does not return 16 bytes (n=%d, handle=%d, udp_fd=%d, errno=%d)",
+        cs_log("%s server does not return 16 bytes (n=%d, handle=%d, udp_fd=%d, errno=%d)",
                 rdr->label, n, handle, cl->udp_fd, err);
         block_connect(rdr);
@@ -3406 +3401 @@
     //      loc_sa.sin_port = htons(rdr->l_port);
 
+    if (cl->udp_fd)
+        cc_cli_close(cl, FALSE);
+        
     if ((cl->udp_fd = socket(PF_INET, SOCK_STREAM, p_proto)) <= 0) {
         cs_log("%s Socket creation failed (errno=%d, socket=%d)", rdr->label,

trunk/oscam-simples.c

@@ -932 +932 @@
 }
 
+static char *netw_ext_prot[] = { "cccam", "cccam ext", "newcamd524" };
+
 char *reader_get_type_desc(struct s_reader * rdr, int extended)
 {
@@ -943 +945 @@
 
     if ((rdr->typ == R_NEWCAMD) && (rdr->ncd_proto == NCD_524))
-        desc = "newcamd524";
+        desc = netw_ext_prot[2];
 
     else if (rdr->typ == R_CCCAM)
-        desc = "cccam";
+        desc = netw_ext_prot[0];
 
     else if (rdr->client && rdr->client->cc && ((struct cc_data *)rdr->client->cc)->extended_mode) {
-        if(extended)
-            desc = "cccam ext";
-        else
-            desc = "cccam";
+        desc = netw_ext_prot[extended];
     }
 
@@ -967 +966 @@
         case 'c'    :
             if (cl->cc && ((struct cc_data *)cl->cc)->extended_mode) {
-                ctyp = "cccam ext";
+                ctyp = netw_ext_prot[1];
                 break;
             }