Changeset 8455

Timestamp:

03/02/13 22:43:11 (10 years ago)

Author:

gf

Message:

Make ptab in struct s_module embedded not a pointer.

This blows up bss (static) memory nearly twice but we'll get that
back and lots more once we slim down struct s_port in the next
commit.

Location:

trunk

Files:

• globals.h (modified) (1 diff)
• module-camd33.c (modified) (1 diff)
• module-camd35.c (modified) (2 diffs)
• module-cccam.c (modified) (1 diff)
• module-csp.c (modified) (1 diff)
• module-ghttp.c (modified) (1 diff)
• module-monitor.c (modified) (1 diff)
• module-newcamd.c (modified) (1 diff)
• module-pandora.c (modified) (1 diff)
• module-radegast.c (modified) (1 diff)
• oscam-client.c (modified) (1 diff)
• oscam-ecm.c (modified) (1 diff)
• oscam-failban.c (modified) (1 diff)
• oscam-net.c (modified) (1 diff)
• oscam.c (modified) (3 diffs)

trunk/globals.h

@@ -691 +691 @@
 #endif
     int32_t         c_port;
-    PTAB            *ptab;
+    PTAB            ptab;
     int32_t         num;
 };

trunk/module-camd33.c

@@ -166 +166 @@
 {
   cfg.c33_crypted = check_filled(cfg.c33_key, sizeof(cfg.c33_key));
-  static PTAB ptab; //since there is always only 1 camd33 server running, this is threadsafe
-  ptab.ports[0].s_port = cfg.c33_port;
-  ph->ptab = &ptab;
-  ph->ptab->nports = 1;
+  ph->ptab.nports = 1;
+  ph->ptab.ports[0].s_port = cfg.c33_port;
 
   ph->desc="camd33";

trunk/module-camd35.c

@@ -917 +917 @@
 void module_camd35(struct s_module *ph)
 {
-  static PTAB ptab; //since there is always only 1 camd35 server running, this is threadsafe
-  ptab.ports[0].s_port = cfg.c35_port;
-  ph->ptab = &ptab;
-  ph->ptab->nports = 1;
+  ph->ptab.nports = 1;
+  ph->ptab.ports[0].s_port = cfg.c35_port;
 
   ph->desc="camd35";
@@ -949 +947 @@
   ph->large_ecm_support = 1;
   ph->listenertype = LIS_CAMD35TCP;
-  ph->ptab=&cfg.c35_tcp_ptab;
-  if (ph->ptab->nports==0)
-    ph->ptab->nports=1; // show disabled in log
+  ph->ptab = cfg.c35_tcp_ptab;
   IP_ASSIGN(ph->s_ip, cfg.c35_tcp_srvip);
   ph->s_handler=camd35_server;

trunk/module-cccam.c

@@ -3807 +3807 @@
 
 #ifdef MODULE_CCCSHARE
-    static PTAB ptab; //since there is always only 1 cccam server running, this is threadsafe
-    memset(&ptab, 0, sizeof(PTAB));
     int32_t i;
     for (i=0;i<CS_MAXPORTS;i++) {
         if (!cfg.cc_port[i]) break;
-        ptab.ports[i].s_port = cfg.cc_port[i];
-        ptab.nports++;
-    }
-
-    ph->ptab = &ptab;
+        ph->ptab.ports[i].s_port = cfg.cc_port[i];
+        ph->ptab.nports++;
+    }
 
     if (cfg.cc_port[0])

trunk/module-csp.c

@@ -148 +148 @@
 void module_csp(struct s_module *ph)
 {
-  static PTAB ptab; //since there is always only 1 csp server running, this is threadsafe
-  ptab.ports[0].s_port = cfg.csp_port;
-  ph->ptab = &ptab;
-  ph->ptab->nports = 1;
+  ph->ptab.nports = 1;
+  ph->ptab.ports[0].s_port = cfg.csp_port;
 
   ph->desc="csp";

trunk/module-ghttp.c

@@ -259 +259 @@
 void module_ghttp(struct s_module *ph)
 {
-  static PTAB ptab;
-  // ptab.ports[0].s_port = cfg.ghttp_port;
-  ph->ptab = &ptab;
-  ph->ptab->nports = 0;
+  ph->ptab.nports = 0;
+  // ph->ptab.ports[0].s_port = cfg.ghttp_port;
 
   ph->desc = "ghttp";

trunk/module-monitor.c

@@ -867 +867 @@
 
 void module_monitor(struct s_module *ph){
-    static PTAB ptab; //since there is always only 1 monitor running, this is threadsafe
-    ptab.ports[0].s_port = cfg.mon_port;
-    ph->ptab = &ptab;
-    ph->ptab->nports = 1;
+    ph->ptab.nports = 1;
+    ph->ptab.ports[0].s_port = cfg.mon_port;
     ph->desc = "monitor";
     ph->type=MOD_CONN_UDP;

trunk/module-newcamd.c

@@ -1459 +1459 @@
   ph->recv=newcamd_recv;
   ph->send_dcw=newcamd_send_dcw;
-  ph->ptab=&cfg.ncd_ptab;
-  if( ph->ptab->nports==0 )
-      ph->ptab->nports=1; // show disabled in log
+  ph->ptab=cfg.ncd_ptab;
   ph->c_init=newcamd_client_init;
   ph->c_recv_chk=newcamd_recv_chk;

trunk/module-pandora.c

@@ -256 +256 @@
 
 void module_pandora(struct s_module *ph) {
-    static PTAB ptab;
-    ptab.ports[0].s_port = cfg.pand_port;
-    ph->ptab = &ptab;
-    ph->ptab->nports = 1;
+    ph->ptab.nports = 1;
+    ph->ptab.ports[0].s_port = cfg.pand_port;
     ph->num = R_PANDORA;
 

trunk/module-radegast.c

@@ -238 +238 @@
 void module_radegast(struct s_module *ph)
 {
-  static PTAB ptab; //since there is always only 1 radegast server running, this is threadsafe
-  ptab.ports[0].s_port = cfg.rad_port;
-  ph->ptab = &ptab;
-  ph->ptab->nports = 1;
+  ph->ptab.nports = 1;
+  ph->ptab.ports[0].s_port = cfg.rad_port;
 
   ph->desc="radegast";

trunk/oscam-client.c

@@ -142 +142 @@
                     (unsigned long)pthread_self(), usr, cs_inet_ntoa(cl->ip), buf, uniq);
                 if (client->failban & BAN_DUPLICATE) {
-                    cs_add_violation_by_ip(ip, get_module(client)->ptab->ports[client->port_idx].s_port, usr);
+                    cs_add_violation_by_ip(ip, get_module(client)->ptab.ports[client->port_idx].s_port, usr);
                 }
                 if (cfg.dropdups){

trunk/oscam-ecm.c

@@ -1277 +1277 @@
             case 4:
                 // invalid (sfilter)
-                if (!chk_sfilter(er, get_module(client)->ptab))
+                if (!chk_sfilter(er, &get_module(client)->ptab))
                     er->rc = E_INVALID;
                 break;

trunk/oscam-failban.c

@@ -80 +80 @@
 void cs_add_violation(struct s_client *cl, char *info) {
     struct s_module *module = get_module(cl);
-    cs_add_violation_by_ip(cl->ip, module->ptab ? module->ptab->ports[cl->port_idx].s_port : 0, info);
+    cs_add_violation_by_ip(cl->ip, module->ptab.ports[cl->port_idx].s_port, info);
 }

trunk/oscam-net.c

@@ -367 +367 @@
     int32_t scad = sizeof(cad), n;
     struct s_client *cl;
-    struct s_port *port = &module->ptab->ports[port_idx];
+    struct s_port *port = &module->ptab.ports[port_idx];
 
     if (module->type==MOD_CONN_UDP) {

trunk/oscam.c

@@ -989 +989 @@
         for (k = 0; k < CS_MAX_MOD; k++) {
             struct s_module *module = &modules[k];
-            if ((module->type & MOD_CONN_NET) && module->ptab) {
-                for (j = 0; j < module->ptab->nports; j++) {
-                    if (module->ptab->ports[j].fd) {
+            if ((module->type & MOD_CONN_NET)) {
+                for (j = 0; j < module->ptab.nports; j++) {
+                    if (module->ptab.ports[j].fd) {
                         cl_size = chk_resize_cllist(&pfd, &cl_list, cl_size, pfdcount);
                         cl_list[pfdcount] = NULL;
-                        pfd[pfdcount].fd = module->ptab->ports[j].fd;
+                        pfd[pfdcount].fd = module->ptab.ports[j].fd;
                         pfd[pfdcount++].events = POLLIN | POLLPRI | POLLHUP;
                     }
@@ -1066 +1066 @@
                 for (k = 0; k < CS_MAX_MOD; k++) {
                     struct s_module *module = &modules[k];
-                    if ((module->type & MOD_CONN_NET) && module->ptab) {
-                        for (j = 0; j < module->ptab->nports; j++) {
-                            if (module->ptab->ports[j].fd && module->ptab->ports[j].fd == pfd[i].fd) {
+                    if ((module->type & MOD_CONN_NET)) {
+                        for (j = 0; j < module->ptab.nports; j++) {
+                            if (module->ptab.ports[j].fd && module->ptab.ports[j].fd == pfd[i].fd) {
                                 accept_connection(module, k, j);
                             }
@@ -1418 +1418 @@
     for (i = 0; i < CS_MAX_MOD; i++) {
         struct s_module *module = &modules[i];
-        if ((module->type & MOD_CONN_NET) && module->ptab) {
-            for (j = 0; j < module->ptab->nports; j++) {
-                start_listener(module, &module->ptab->ports[j]);
+        if ((module->type & MOD_CONN_NET)) {
+            for (j = 0; j < module->ptab.nports; j++) {
+                start_listener(module, &module->ptab.ports[j]);
             }
         }