Changeset 4129

Timestamp:

12/16/10 21:34:13 (12 years ago)

Author:

alno

Message:

XMLAPI: implementation of API call for statuspage. It's just to have a base for discussion with App developers (IPhone, Android, STB Plugins). Call the API with ​http://<Oscam IP>/oscamapi.html?part=status The API uses the normal WebIF way and the same credenticals as well as SSL if enabled.
Please test and join the discussion for requests and suggestions: ​http://streamboard.gmc.to/wbb2/thread.php?postid=362448#post362448

Location:

trunk

Files:

• oscam-http.c (modified) (8 diffs)
• oscam-http.h (modified) (6 diffs)

trunk/oscam-http.c

@@ -1801 +1801 @@
 }
 
-void send_oscam_status(struct templatevars *vars, FILE *f, struct uriparams *params, struct in_addr in) {
+void send_oscam_status(struct templatevars *vars, FILE *f, struct uriparams *params, struct in_addr in, int apicall) {
     int i;
     char *usr;
@@ -2060 +2060 @@
             }
 
-            // select right suborder
-            if (cl->typ == 'c') {
-                tpl_addVar(vars, 1, "CLIENTSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
-                tpl_printf(vars, 0, "CLIENTHEADLINE", "<TR><TD CLASS=\"subheadline\" colspan=\"17\">Clients %d/%d</TD></TR>\n", 
-                    user_count_active, user_count_all);
-            }
-            else if (cl->typ == 'r') {
-                tpl_addVar(vars, 1, "READERSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
-                tpl_printf(vars, 0, "READERHEADLINE", "<TR><TD CLASS=\"subheadline\" colspan=\"17\">Readers %d/%d</TD></TR>\n",
-                    reader_count_active, reader_count_all);
-            }
-            else if (cl->typ == 'p') {
-                tpl_addVar(vars, 1, "PROXYSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
-                tpl_printf(vars, 0, "PROXYHEADLINE", "<TR><TD CLASS=\"subheadline\" colspan=\"17\">Proxies %d/%d</TD></TR>\n",
-                    proxy_count_active, proxy_count_all);
-            }
-            else
-                tpl_addVar(vars, 1, "SERVERSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
+            if (!apicall){
+                // select right suborder
+                if (cl->typ == 'c') {
+                    tpl_addVar(vars, 1, "CLIENTSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
+                    tpl_printf(vars, 0, "CLIENTHEADLINE", "<TR><TD CLASS=\"subheadline\" colspan=\"17\">Clients %d/%d</TD></TR>\n",
+                            user_count_active, user_count_all);
+                }
+                else if (cl->typ == 'r') {
+                    tpl_addVar(vars, 1, "READERSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
+                    tpl_printf(vars, 0, "READERHEADLINE", "<TR><TD CLASS=\"subheadline\" colspan=\"17\">Readers %d/%d</TD></TR>\n",
+                            reader_count_active, reader_count_all);
+                }
+                else if (cl->typ == 'p') {
+                    tpl_addVar(vars, 1, "PROXYSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
+                    tpl_printf(vars, 0, "PROXYHEADLINE", "<TR><TD CLASS=\"subheadline\" colspan=\"17\">Proxies %d/%d</TD></TR>\n",
+                            proxy_count_active, proxy_count_all);
+                }
+                else
+                    tpl_addVar(vars, 1, "SERVERSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
+
+            } else {
+                tpl_addVar(vars, 1, "APISTATUSBITS", tpl_getTpl(vars, "APISTATUSBIT"));
+            }
 
         }
@@ -2097 +2102 @@
         p_usr=(char *)(loghist+(i*CS_LOGHISTSIZE));
         p_txt=p_usr+32;
-        if (p_txt[0]) tpl_printf(vars, 1, "LOGHISTORY", "<span class=\"%s\">%s</span><br>\n", p_usr, p_txt+8);
+
+        if (!apicall) {
+            if (p_txt[0]) tpl_printf(vars, 1, "LOGHISTORY", "<span class=\"%s\">%s</span><br>\n", p_usr, p_txt+8);
+        } else {
+            tpl_printf(vars, 1, "LOGHISTORY", "%s", p_txt+8);
+        }
     }
 #else
@@ -2108 +2118 @@
     tpl_addVar(vars, 0, "SDEBUG", tpl_getTpl(vars, "DEBUGSELECT"));
 
-    webif_write(tpl_getTpl(vars, "STATUS"), f);
+    if(!apicall)
+        webif_write(tpl_getTpl(vars, "STATUS"), f);
+    else
+        webif_write(tpl_getTpl(vars, "APISTATUS"), f);
+
 }
 
@@ -2537 +2551 @@
 
     webif_write(tpl_getTpl(vars, "FAILBAN"), f);
+}
+
+void send_oscam_api(struct templatevars *vars, FILE *f, struct uriparams *params, struct in_addr in) {
+    if (strcmp(getParam(params, "part"), "status") == 0) {
+        send_oscam_status(vars, f, params, in, 1);
+    }
 }
 
@@ -2631 +2651 @@
         "/readerstats.html",
         "/failban.html",
-        "/oscam.js"};
+        "/oscam.js",
+        "/oscamapi.html"};
 
     int pagescnt = sizeof(pages)/sizeof(char *); // Calculate the amount of items in array
@@ -2775 +2796 @@
             case 1: send_oscam_reader(vars, f, &params, in); break;
             case 2: send_oscam_entitlement(vars, f, &params); break;
-            case 3: send_oscam_status(vars, f, &params, in); break;
+            case 3: send_oscam_status(vars, f, &params, in, 0); break;
             case 4: send_oscam_user_config(vars, f, &params, in); break;
             case 5: send_oscam_reader_config(vars, f, &params, in); break;
@@ -2789 +2810 @@
             case 15: send_oscam_reader_stats(vars, f, &params); break;
             case 16: send_oscam_failban(vars, f, &params); break;
-            default: send_oscam_status(vars, f, &params, in); break;
+            //case  8: js file
+            case 18: send_oscam_api(vars, f, &params, in); break;
+            default: send_oscam_status(vars, f, &params, in, 0); break;
         }
         tpl_clear(vars);

trunk/oscam-http.h

@@ -242 +242 @@
         </DIV>"
 
+#define TPLAPIHEADER "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
+<oscam version=\"##CS_VERSION## build ###CS_SVN_VERSION##\" starttime=\"##STARTDATE## - ##STARTTIME##\">\n"
+
 #define TPLFOOTER "\
         <BR><HR/><BR><DIV CLASS=\"footer\">\n\
@@ -250 +253 @@
         </BODY>\
         </HTML>"
+
+#define TPLAPIFOOTER "</oscam>"
 
 #define TPLREFRESH "\
@@ -410 +415 @@
         ##TPLFOOTER##"
 
+#define TPLAPISTATUS "##TPLAPIHEADER##\n\
+   <status>\n\
+##APISTATUSBITS##\
+   </status>\n\
+   <log>\n\
+   ##LOGHISTORY##\
+   </log>\
+##TPLAPIFOOTER##"
+
+
 #define TPLCLIENTSTATUSBIT "\
         <TR class=\"##CLIENTTYPE##\">\n\
@@ -430 +445 @@
         <TD align=\"center\">##CLIENTCON##</TD>\n\
         </TR>\n"
+
+
+#define TPLAPISTATUSBIT "      <client type=\"##CLIENTTYPE##\" name=\"##CLIENTUSER##\" protocol=\"##CLIENTPROTO##\" protocolext=\"##CLIENTPROTOTITLE##\">\n\
+         <request caid=\"##CLIENTCAID##\" srvid=\"##CLIENTSRVID##\">##CLIENTSRVPROVIDER####CLIENTSRVNAME##</request>\n\
+         <times login=\"##CLIENTLOGINDATE##\" last=\"##CLIENTLOGINSECS##\" idle=\"##CLIENTIDLESECS##\"></times>\n\
+         <connection ip=\"##CLIENTIP##\" port=\"##CLIENTPORT##\">##CLIENTCON##</connection>\n\
+      </client>\n"
+
 
 #define TPLUSERCONFIGLIST "\
@@ -1334 +1357 @@
 char *tpl[]={
     "HEADER",
+    "APIHEADER",
     "FOOTER",
+    "APIFOOTER",
     "MENU",
     "REFRESH",
     "STATUS",
+    "APISTATUS",
     "CLIENTSTATUSBIT",
+    "APISTATUSBIT",
     "USERCONFIGLIST",
     "ADDNEWUSER",
@@ -1421 +1448 @@
 char *tplmap[]={
     TPLHEADER,
+    TPLAPIHEADER,
     TPLFOOTER,
+    TPLAPIFOOTER,
     TPLMENU,
     TPLREFRESH,
     TPLSTATUS,
+    TPLAPISTATUS,
     TPLCLIENTSTATUSBIT,
+    TPLAPISTATUSBIT,
     TPLUSERCONFIGLIST,
     TPLADDNEWUSER,