Changeset b5e3f15c3ecb424e105dd5a93288c5f134de6816

Timestamp:

04/06/09 00:26:38 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

8ecd62957f2caca419e633605e4b81d2936660ae

Parents:

59f8607b48ef867c2d3338c9c840006b0f459b9d

git-committer:

Neutron Soutmun <neo.neutron@…> (04/06/09 00:26:38)

Message:

Fix the member deleted during polling process

2009-04-06 Neutron Soutmun <neo.neutron@…>

• src/rahunasd.c, src/rh-task-{memset,ipset}.c: Fix the member deleted during polling process that cause the process will stop unexpectly.
• src/rh-task-dbset.c:
  • Using task_req and rh_task_startsess to restore set data from DB instead of manual call.
• src/rh-task.h: Add bandwidth_slot_id into task_req structure.
• src/rh-xmlrpc-server.c: Initial session_start = 0 to trigger the program to use the current timestamp;

Files:

• ChangeLog (modified) (1 diff)
• src/rahunasd.c (modified) (2 diffs)
• src/rh-task-dbset.c (modified) (4 diffs)
• src/rh-task-ipset.c (modified) (2 diffs)
• src/rh-task-memset.c (modified) (5 diffs)
• src/rh-task.h (modified) (1 diff)
• src/rh-xmlrpc-server.c (modified) (1 diff)

ChangeLog

@@ +1 @@
+2009-04-06  Neutron Soutmun <neo.neutron@gmail.com>
+
+        * src/rahunasd.c, src/rh-task-{memset,ipset}.c: Fix the member deleted during
+          polling process that cause the process will stop unexpectly.
+        * src/rh-task-dbset.c:
+          - Using task_req and rh_task_startsess to restore set data from DB instead
+            of manual call.
+        * src/rh-task.h: Add bandwidth_slot_id into task_req structure.
+        * src/rh-xmlrpc-server.c: Initial session_start = 0 to trigger the program
+          to use the current timestamp;
+
 2009-04-03  Neutron Soutmun <neo.neutron@gmail.com>
 

src/rahunasd.c

@@ -102 +102 @@
   while (runner != NULL) {
     member = (struct rahunas_member *)runner->data;
+    runner = g_list_next(runner);
+
     id = member->id;
 
@@ -130 +132 @@
       res = rh_task_stopsess(process->vs, &req);
     }
-
-    runner = g_list_next(runner);
   }
 }

src/rh-task-dbset.c

@@ -14 +14 @@
 #include "rh-ipset.h"
 #include "rh-utils.h"
-#include "rh-task-memset.h"
-#include "rh-task-bandwidth.h"
 
 struct dbset_row {
@@ -208 +206 @@
   GList *member_node = NULL;
   struct rahunas_member *member = NULL;
-  struct bandwidth_req bw_req;
+  struct task_req req;
+  unsigned char ethernet[ETH_ALEN] = {0,0,0,0,0,0};
   unsigned char max_try = 3;
  
@@ -226 +225 @@
     id = iptoid(vs->v_map, row->ip);
 
-    DP("id=%d", id);
-    
     if (id < 0)
       continue;
 
-    member_node = member_get_node_by_id(vs, id);
-
-    if (member_node == NULL) {
-      DP("Create new member");
-      member = (struct rahunas_member *) rh_malloc(sizeof(struct rahunas_member));
-      if (member == NULL)
-        continue; 
-      
-      memset(member, 0, sizeof(struct rahunas_member));
-      vs->v_map->members =
-        g_list_insert_sorted(vs->v_map->members, member, idcmp);
-    } else {
-      DP("Member already exists");
-      member = (struct rahunas_member *) member_node->data;
-    }
-
-    // MEMSET
-    member->id = id;
-    member->session_id = g_strdup(row->session_id);
-    member->username   = g_strdup(row->username);
-    parse_mac(row->mac, &member->mac_address); 
-    memcpy(&member->session_start, &row->session_start, 
-           sizeof(time_t));
-    memcpy(&member->session_timeout, &row->session_timeout, 
-           sizeof(time_t));
-    member->bandwidth_slot_id = row->bandwidth_slot_id;
-    member->bandwidth_max_down = row->bandwidth_max_down;
-    member->bandwidth_max_up = row->bandwidth_max_up;
-
-    // IPSET
-    DP("Restore, ip=%s, mac=%s", row->ip, row->mac);
-    set_adtip(vs->v_set, row->ip, row->mac, IP_SET_OP_ADD_IP);
-
-
-    // Bandwidth
-    sprintf(bw_req.ip, "%s", row->ip);
-    sprintf(bw_req.bandwidth_max_down, "%lu", row->bandwidth_max_down);
-    sprintf(bw_req.bandwidth_max_up, "%lu", row->bandwidth_max_up);
-    sprintf(bw_req.slot_id, "%u", row->bandwidth_slot_id); 
-
-    mark_reserved_slot_id(row->bandwidth_slot_id);
-
-    while (max_try-- > 0) { 
-      if (bandwidth_add(vs, &bw_req) == 0)
-        break;
-    }
+    req.id = id;
+    req.vserver_id = atoi(row->vserver_id);
+    req.username = row->username;
+    req.session_id = row->session_id;
+    parse_mac(row->mac, &ethernet);
+    memcpy(req.mac_address, &ethernet, ETH_ALEN);
+
+    req.session_start = row->session_start;
+    req.session_timeout = row->session_timeout;
+
+    req.bandwidth_slot_id = row->bandwidth_slot_id;
+    req.bandwidth_max_down = row->bandwidth_max_down; 
+    req.bandwidth_max_up = row->bandwidth_max_up;
+
+    rh_task_startsess(vs, &req);
   }
   return TRUE;
@@ -373 +339 @@
                  PROGRAM, NULL, NULL,
                  GDA_CONNECTION_OPTIONS_NONE, NULL);
-  
+
   strftime(&time_str, sizeof time_str, "%s", localtime(&req->session_start));
   strftime(&time_str2, sizeof time_str2, "%s", 

src/rh-task-ipset.c

@@ -34 +34 @@
   while (runner != NULL) {
     member = (struct rahunas_member *) runner->data;
+    runner = g_list_next(runner);
+
     id = member->id;
 
@@ -42 +44 @@
     send_xmlrpc_stopacct(process->vs, id, RH_RADIUS_TERM_NAS_REBOOT);
     rh_task_stopsess(process->vs, &req);
-
-    runner = g_list_next(runner);
   }
 }

src/rh-task-memset.c

@@ -32 +32 @@
 gint idcmp(struct rahunas_member *a, struct rahunas_member *b)
 {
-  if (a == NULL || b == NULL)
-    return 0;
-
   if (a != NULL && b != NULL)
     return (a->id - b->id);
+
+  return -1;
 }
 
@@ -66 +65 @@
 {
   GList *runner = NULL;
+  GList *deleting = NULL;
   struct rahunas_member *member = NULL;
 
@@ -78 +78 @@
       member = (struct rahunas_member *) runner->data; 
 
+      DP("Cleanup IP: %s", idtoip(vs->v_map, member->id));
+
       rh_free_member(member);
-
-      runner = g_list_delete_link(runner, runner);
+      deleting = runner;
+      runner = g_list_next(runner);
+
+      vs->v_map->members = g_list_delete_link(vs->v_map->members, deleting);
     }
 
@@ -123 +127 @@
 
     vs->v_map->members = 
-      g_list_insert_sorted(vs->v_map->members, member, idcmp);
+        g_list_insert_sorted(vs->v_map->members, member, idcmp);
+
   } else {
     DP("Member already exists");
@@ -145 +150 @@
     member->session_id = termstring;
 
-  time(&(member->session_start));
-  memcpy(&req->session_start, &member->session_start, 
-         sizeof(time_t));
+  if (req->session_start == 0) {
+    time(&(req->session_start));
+  } 
+
+  memcpy(&member->session_start, &req->session_start, sizeof(time_t));
 
   memcpy(&member->mac_address, &req->mac_address, ETH_ALEN);

src/rh-task.h

@@ -20 +20 @@
   time_t session_start;
   time_t session_timeout;
+  unsigned short bandwidth_slot_id; 
   unsigned long bandwidth_max_down;
   unsigned long bandwidth_max_up;

src/rh-xmlrpc-server.c

@@ -79 +79 @@
   parse_mac(mac_address, &ethernet);
   memcpy(req.mac_address, &ethernet, ETH_ALEN);
+  req.session_start = 0;
   req.session_timeout = 0;