Changeset 11337

Timestamp:

01/15/17 10:55:40 (6 years ago)

Author:

Gorgone Impertinence

Message:

add halfcw fix for #4359

File:

• trunk/oscam-chk.c (modified) (18 diffs)

trunk/oscam-chk.c

@@ -28 +28 @@
 }
 
-
 static int32_t find_nano(uchar *ecm, int32_t l, uchar nano, int32_t s)
 {
@@ -190 +189 @@
 }
 
-
 int32_t has_lb_srvid(struct s_client *cl, ECM_REQUEST *er)
 {
@@ -205 +203 @@
     return 0;
 }
-
 
 int32_t chk_srvid_match_by_caid_prov(uint16_t caid, uint32_t provid, SIDTAB *sidtab)
@@ -400 +397 @@
 }
 
-
 int32_t chk_ident_filter(uint16_t rcaid, uint32_t rprid, FTAB *ftab)
 {
@@ -430 +426 @@
     return(rc);
 }
-
 
 int32_t chk_ufilters(ECM_REQUEST *er)
@@ -573 +568 @@
     return (rc);
 }
-
 
 static int32_t chk_rfilter(ECM_REQUEST *er, struct s_reader *rdr)
@@ -984 +978 @@
             if(skip == 0 || (foundcaid == 1 && foundprovid == 1 && entryok == 0 && skip == 1))
             {
-                cs_log_dump_dbg(D_TRACE, er->ecm, er->ecmlen,
-                              "following ECM %04X@%06X:%04X was filtered by ECMHeaderwhitelist of Reader %s from User %s because of not matching Header:",
-                              er->caid, er->prid, er->srvid, rdr->label, username(er->client));
+                cs_log_dump_dbg(D_TRACE, er->ecm, er->ecmlen, "following ECM %04X@%06X:%04X was filtered by ECMHeaderwhitelist of Reader %s from User %s because of not matching Header:", er->caid, er->prid, er->srvid, rdr->label, username(er->client));
                 rdr->ecmsfilteredhead += 1;
                 rdr->webif_ecmsfilteredhead += 1;
@@ -997 +989 @@
 
     //Check ip source+dest:
-    if(cfg.block_same_ip && IP_EQUAL(cur_cl->ip, rdr->client->ip) &&
-            get_module(cur_cl)->listenertype != LIS_DVBAPI &&
-            is_network_reader(rdr))
-    {
-        rdr_log_dbg(rdr, D_TRACE, "User (%s) has the same ip (%s) as the reader, blocked because block_same_ip=1!",
-                       username(cur_cl), cs_inet_ntoa(rdr->client->ip));
+    if(cfg.block_same_ip && IP_EQUAL(cur_cl->ip, rdr->client->ip) && get_module(cur_cl)->listenertype != LIS_DVBAPI && is_network_reader(rdr))
+    {
+        rdr_log_dbg(rdr, D_TRACE, "User (%s) has the same ip (%s) as the reader, blocked because block_same_ip=1!", username(cur_cl), cs_inet_ntoa(rdr->client->ip));
         return 0;
     }
@@ -1008 +997 @@
     if(cfg.block_same_name && strcmp(username(cur_cl), rdr->label) == 0)
     {
-        rdr_log_dbg(rdr, D_TRACE, "User (%s) has the same name as the reader, blocked because block_same_name=1!",
-                       username(cur_cl));
+        rdr_log_dbg(rdr, D_TRACE, "User (%s) has the same name as the reader, blocked because block_same_name=1!", username(cur_cl));
         return 0;
     }
@@ -1029 +1017 @@
     {
         CAIDTAB_DATA *d = &ctab->ctdata[i];
-        if((caid & d->mask) == d->caid)
-            return d->cmap ? d->cmap : caid;
+        if((caid & d->mask) == d->caid) { return d->cmap ? d->cmap : caid; }
     }
     return -1;
@@ -1052 +1039 @@
     int32_t caid;
     caid = chk_caid(er->caid, ctab);
-    if(caid < 0)
-        { return 0; }
+    if(caid < 0) { return 0; }
     er->caid = caid;
     return 1;
@@ -1072 +1058 @@
 }
 
-
-
 /**
  * Check for ecm request that expects half cw format
@@ -1079 +1063 @@
 int8_t is_halfCW_er(ECM_REQUEST *er)
 {
-    if(caid_is_videoguard(er->caid) &&
-     (er->caid == 0x09C4 || er->caid ==  0x098C || er->caid == 0x0963 || er->caid == 0x09CD || er->caid == 0x0919 || er->caid == 0x093B || er->caid == 0x098E)
-    )
-        return 1;
-
-  return 0;
-}
-
+    if( caid_is_videoguard(er->caid) && (er->caid == 0x09C4 || er->caid == 0x09C7 || er->caid == 0x098C || er->caid == 0x0963 || er->caid == 0x09CD || er->caid == 0x0919 || er->caid == 0x093B || er->caid == 0x098E))
+        { return 1; }
+    return 0;
+}
 
 /**
@@ -1093 +1073 @@
 int8_t chk_halfCW(ECM_REQUEST *er, uchar *cw)
 {
-  if(is_halfCW_er(er) && cw){
-
-     int8_t part1 = checkCWpart(cw, 0);
-     int8_t part2 = checkCWpart(cw, 1);
-
-     //check for correct half cw format
-     if(part1 && part2){
-         return 0;
-     }
-
-     //check for correct cw position
-     if(
-        (get_odd_even(er) == 0x80 && part1 && !part2)   //xxxxxxxx00000000
+    if(is_halfCW_er(er) && cw)
+    {
+        uchar cw15 = cw[15];
+        if(get_odd_even(er) == 0x80 && cw[15] == 0xF0) { cw[15] = 0; }
+
+        int8_t part1 = checkCWpart(cw, 0);
+        int8_t part2 = checkCWpart(cw, 1);
+
+        //check for correct half cw format
+        if(part1 && part2){ cw[15] = cw15; return 0; }
+
+        //check for correct cw position
+        if(
+        (get_odd_even(er) == 0x80 && part1 && !part2)   //xxxxxxxx00000000
         ||
         (get_odd_even(er) == 0x81 && !part1 && part2)   //00000000xxxxxxxx
-     )
-     {
-        return 1;
-     }
-
-     return 0;  //not correct swapped cw
-
-  }else
+        )
+        { return 1; }
+        cw[15] = cw15;
+        return 0;  //not correct swapped cw
+    }else
     return 1;
 }
-
 
 /**
@@ -1128 +1105 @@
     for(i = 0; i < len; i++)
     {
-        if(node_id[i])
-            { return 0; }
+        if(node_id[i]) { return 0; }
     }
     return 1;
@@ -1137 +1113 @@
 bool check_client(struct s_client *cl)
 {
-    if(cl && !cl->kill)
-        { return true; }
+    if(cl && !cl->kill) { return true; }
     return false;
 }
@@ -1148 +1123 @@
     {
         CAIDVALUETAB_DATA *cvdata = &cv->cvdata[i];
-        if(cvdata->caid == caid || cvdata->caid == caid >> 8)
-            return cvdata->value;
+        if(cvdata->caid == caid || cvdata->caid == caid >> 8) { return cvdata->value; }
     }
     return default_value;
@@ -1158 +1132 @@
     uint32_t i, is_fakecw = 0;
     uint32_t idx = ((cw[0]&0xF)<<4) | (cw[8]&0xF); 
-    
+
     cs_readlock(__func__, &config_lock);
     for(i=0; i<cfg.fakecws[idx].count; i++)