Changeset 8226

Timestamp:

01/28/13 20:42:13 (11 years ago)

Author:

gf

Message:

newcamd: Add connectoninit setting.

Patch by manu posted in ticket #3101.

Location:

trunk

Files:

• globals.h (modified) (1 diff)
• module-newcamd.c (modified) (1 diff)
• module-webif-pages.c (modified) (2 diffs)
• module-webif.c (modified) (1 diff)
• oscam-config-reader.c (modified) (2 diffs)

trunk/globals.h

@@ -1203 +1203 @@
     uint8_t         ncd_key[14];
     uchar           ncd_skey[16];
+    int8_t          ncd_connect_on_init;
     int8_t          ncd_disable_server_filt;
     int8_t          ncd_proto;

trunk/module-newcamd.c

@@ -1292 +1292 @@
           (client->reader->ncd_proto==NCD_525)?5:4, client->udp_fd, ptxt);
 
+  // try to connect. ignore possible failures
+  if (client->reader->ncd_connect_on_init)
+    newcamd_connect();
+
   return(0);
 }

trunk/module-webif-pages.c

@@ -1406 +1406 @@
             <TR><TD>##TPLHELPPREFIX##server#password##TPLHELPSUFFIX##Password:</A></TD><TD><input name=\"password\" type=\"text\" size=\"30\" maxlength=\"50\" value=\"##PASSWORD##\"></TD></TR>\n\
             <TR><TD>##TPLHELPPREFIX##server#key##TPLHELPSUFFIX##Key:</A></TD><TD><input name=\"key\" type=\"text\" size=\"40\" maxlength=\"28\" value=\"##NCD_KEY##\"></TD></TR>\n\
+            <TR><TD>##TPLHELPPREFIX##server#connectoninit##TPLHELPSUFFIX##Connect on init:</A><input name=\"connectoninit\" type=\"hidden\" value=\"0\"></TD><TD><input name=\"connectoninit\" type=\"checkbox\" value=\"1\" ##CONNECTONINITCHECKED##></TD></TR>\n\
             <TR><TD>##TPLHELPPREFIX##server#inactivitytimeout##TPLHELPSUFFIX##Inactivity timeout:</A></TD><TD><input name=\"inactivitytimeout\" type=\"text\" size=\"30\" maxlength=\"50\" value=\"##INACTIVITYTIMEOUT##\">s</TD></TR>\n\
             <TR><TD>##TPLHELPPREFIX##server#reconnecttimeout##TPLHELPSUFFIX##Reconnect timeout:</A></TD><TD><input name=\"reconnecttimeout\" type=\"text\" size=\"30\" maxlength=\"50\" value=\"##RECEIVETIMEOUT##\">s</TD></TR>\n\
@@ -1413 +1414 @@
             <TR><TD>##TPLHELPPREFIX##server#password##TPLHELPSUFFIX##Password:</A></TD><TD><input name=\"password\" type=\"text\" size=\"30\" maxlength=\"50\" value=\"##PASSWORD##\"></TD></TR>\n\
             <TR><TD>##TPLHELPPREFIX##server#key##TPLHELPSUFFIX##Key:</A></TD><TD><input name=\"key\" type=\"text\" size=\"40\" maxlength=\"28\" value=\"##NCD_KEY##\"></TD></TR>\n\
+            <TR><TD>##TPLHELPPREFIX##server#connectoninit##TPLHELPSUFFIX##Connect on init:</A><input name=\"connectoninit\" type=\"hidden\" value=\"0\"></TD><TD><input name=\"connectoninit\" type=\"checkbox\" value=\"1\" ##CONNECTONINITCHECKED##></TD></TR>\n\
             <TR><TD>##TPLHELPPREFIX##server#inactivitytimeout##TPLHELPSUFFIX##Inactivity timeout:</A></TD><TD><input name=\"inactivitytimeout\" type=\"text\" size=\"5\" maxlength=\"5\" value=\"##INACTIVITYTIMEOUT##\">s</TD></TR>\n\
             <TR><TD>##TPLHELPPREFIX##server#reconnecttimeout##TPLHELPSUFFIX##Reconnect timeout:</A></TD><TD><input name=\"reconnecttimeout\" type=\"text\" size=\"5\" maxlength=\"5\" value=\"##RECEIVETIMEOUT##\">s</TD></TR>\n\

trunk/module-webif.c

@@ -1239 +1239 @@
     // Receive timeout
     tpl_printf(vars, TPLADD, "RECEIVETIMEOUT", "%d", rdr->tcp_rto);
+
+    // Connect on init (newcamd only)
+    if(!apicall) {
+        tpl_addVar(vars, TPLADD, "CONNECTONINITCHECKED", (rdr->ncd_connect_on_init == 1) ? "checked" : "");
+    } else {
+        tpl_addVar(vars, TPLADD, "CONNECTONINITCHECKED", (rdr->ncd_connect_on_init == 1) ? "1" : "0");
+    }
 
     // Reset Cycle

trunk/oscam-config-reader.c

@@ -818 +818 @@
     DEF_OPT_INT32("resetcycle"          , OFS(resetcycle),              0 ),
     DEF_OPT_INT8("disableserverfilter"  , OFS(ncd_disable_server_filt), 0 ),
+    DEF_OPT_INT8("connectoninit"        , OFS(ncd_connect_on_init),     0 ),
     DEF_OPT_INT8("smargopatch"          , OFS(smargopatch),             0 ),
     DEF_OPT_UINT8("sc8in1_dtrrts_patch" , OFS(sc8in1_dtrrts_patch),     0 ),
@@ -945 +946 @@
 
     // Special settings for NEWCAMD
-    if (reader->typ != R_NEWCAMD && streq(setting, "disableserverfilter"))
+    static const char *newcamd_settings[] = {
+        "disableserverfilter", "connectoninit",
+        0
+    };
+    if (reader->typ != R_NEWCAMD && in_list(setting, newcamd_settings))
         return false;