Changeset 1866

Timestamp:

03/21/10 16:15:40 (13 years ago)

Author:

alno

Message:

moved monitor_get_srvname() in module-monitor to oscam-simples get_servicename()
WebIF tag patch will not match from this revision onwards

Location:

trunk

Files:

• globals.h (modified) (2 diffs)
• module-dvbapi.c (modified) (1 diff)
• module-monitor.c (modified) (2 diffs)
• oscam-log.c (modified) (1 diff)
• oscam-simples.c (modified) (1 diff)
• oscam.c (modified) (1 diff)

trunk/globals.h

@@ -813 +813 @@
 extern void fprintf_conf(FILE *f, int varnameWidth, const char *varname, const char *fmtstring, ...);
 extern void cs_strncpy(char * destination, const char * source, size_t num);
+extern char *get_servicename(int srvid, int caid);
 
 // oscam variables
@@ -1016 +1017 @@
 // module-monitor
 extern char *monitor_get_proto(int idx);
-extern char *monitor_get_srvname(int srvid, int caid);
 extern int cs_idx2ridx(int idx);
 

trunk/module-dvbapi.c

@@ -618 +618 @@
 
     if (demux[demux_id].ECMpidcount>0) {
-        char *name = monitor_get_srvname(demux[demux_id].program_number, demux[demux_id].ECMpids[0].CA_System_ID);
+        char *name = get_servicename(demux[demux_id].program_number, demux[demux_id].ECMpids[0].CA_System_ID);
         cs_log("dvbapi: new program number: %04X (%s)", program_number, name);
         dvbapi_resort_ecmpids(demux_id);

trunk/module-monitor.c

@@ -241 +241 @@
 }
 
-char *monitor_get_srvname(int srvid, int caid){
-    int i;
-    struct s_srvid *this = cfg->srvid;
-    static char name[83];
-
-    for (name[0] = 0; this && (!name[0]); this = this->next)
-        if (this->srvid == srvid)
-            for (i=0; i<this->ncaid; i++)
-                if (this->caid[i] == caid)
-                    cs_strncpy(name, this->name, 32);
-
-    if (!name[0]) sprintf(name, "%04X:%04X unknown", caid, srvid);
-    if (!srvid) name[0] = '\0';
-    return(name);
-}
+
 
 char *monitor_get_proto(int idx)
@@ -340 +326 @@
                     cs_inet_ntoa(client[i].ip), client[i].port, monitor_get_proto(i),
                     ldate, ltime, lsec, client[i].last_caid, client[i].last_srvid,
-                    monitor_get_srvname(client[i].last_srvid, client[i].last_caid), isec, con);
+                    get_servicename(client[i].last_srvid, client[i].last_caid), isec, con);
         }
     }

trunk/oscam-log.c

@@ -378 +378 @@
         char *channel ="";
         if(cfg->mon_appendchaninfo)
-            channel = monitor_get_srvname(client[idx].last_srvid,client[idx].last_caid);
+            channel = get_servicename(client[idx].last_srvid,client[idx].last_caid);
 
         if(!cfg->disableuserfile) {

trunk/oscam-simples.c

@@ -590 +590 @@
     destination[l] = '\0';
 }
+
+char *get_servicename(int srvid, int caid){
+    int i;
+    struct s_srvid *this = cfg->srvid;
+    static char name[83];
+
+    for (name[0] = 0; this && (!name[0]); this = this->next)
+        if (this->srvid == srvid)
+            for (i=0; i<this->ncaid; i++)
+                if (this->caid[i] == caid)
+                    cs_strncpy(name, this->name, 32);
+
+    if (!name[0]) sprintf(name, "%04X:%04X unknown", caid, srvid);
+    if (!srvid) name[0] = '\0';
+    return(name);
+}

trunk/oscam.c

@@ -1633 +1633 @@
         cs_log("%s (%04X&%06X/%04X/%02X:%04X): %s (%d ms)%s - %s",
                 uname, er->caid, er->prid, er->srvid, er->l, lc,
-                er->rcEx?erEx:stxt[er->rc], client[cs_idx].cwlastresptime, sby, monitor_get_srvname(er->srvid, er->caid));
+                er->rcEx?erEx:stxt[er->rc], client[cs_idx].cwlastresptime, sby, get_servicename(er->srvid, er->caid));
     else
         cs_log("%s (%04X&%06X/%04X/%02X:%04X): %s (%d ms)%s",