Changeset cf90d9f4e60f515ae835451b841ce4df92ca1a34

Timestamp:

11/03/08 02:43:11 (4 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

f51abe393259f4b3a94cea5d277c2dd5865696ee

Parents:

b1bb912de56607e397dd65f43cce29f66f79a172

git-author:

Neutron Soutmun <neo.neutron@…> (09/12/08 18:56:30)

git-committer:

Neutron Soutmun <neo.neutron@…> (11/03/08 02:43:11)

Message:

Add the tasks list concept

2008-09-12 Neutron Soutmun <neo.neutron@…>

• +src/rh-task-*.{h,c}:
  • Add the tasks concept of the workers. eg. memset, ipset,
• dbset and etc.

• Each tasks provide the function to handle each events,

eg. init, start and stop service, start and stop session.

• src/rahunas.{h,c}, src/rh-ipset.{h,c}, src/rh-utils.{h,c}, src/rh-xmlrpc-server.c: Change respectively to new tasks concept and do code beautifier.
• +src/rh-config.h: Move the configuration definitions from rahunasd.h.
• src/Makefile.am: Change respectively to properly build the tasks concept.
• AUTHORS: Add Suriya Soutmun to the author team.

Files:

• AUTHORS (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/rahunasd.c (modified) (10 diffs)
• src/rahunasd.h (modified) (4 diffs)
• src/rh-config.h (added)
• src/rh-ipset.c (modified) (3 diffs)
• src/rh-ipset.h (modified) (2 diffs)
• src/rh-task-dbset.c (added)
• src/rh-task-dbset.h (added)
• src/rh-task-ipset.c (added)
• src/rh-task-ipset.h (added)
• src/rh-task-memset.c (added)
• src/rh-task-memset.h (added)
• src/rh-task.c (added)
• src/rh-task.h (added)
• src/rh-utils.c (modified) (1 diff)
• src/rh-utils.h (modified) (1 diff)
• src/rh-xmlrpc-server.c (modified) (7 diffs)

AUTHORS

@@ -1 +1 @@
 Neutron Soutmun <neo.neutron@gmail.com>
+Suriya Soutmun <darksolar@gmail.com>

ChangeLog

@@ +1 @@
+2008-09-12  Neutron Soutmun <neo.neutron@gmail.com>
+
+        * +src/rh-task-*.{h,c}: 
+                - Add the tasks concept of the workers. eg. memset, ipset,
+            dbset and etc. 
+          - Each tasks provide the function to handle each events, 
+                        eg. init, start and stop service, start and stop session.
+        * src/rahunas.{h,c}, src/rh-ipset.{h,c}, src/rh-utils.{h,c},
+          src/rh-xmlrpc-server.c: 
+          Change respectively to new tasks concept and do code beautifier. 
+        * +src/rh-config.h: Move the configuration definitions from rahunasd.h.
+        * src/Makefile.am: Change respectively to properly build the tasks concept.
+        * AUTHORS: Add Suriya Soutmun to the author team.
+
 2008-09-03  Neutron Soutmun <neo.neutron@gmail.com>
 

src/Makefile.am

@@ -10 +10 @@
         rh-xmlrpc-cmd.c \
   rh-ipset.c \
-        rh-utils.c
+        rh-utils.c \
+        rh-task.c \
+        rh-task-ipset.c \
+        rh-task-memset.c
 
 rahunasd_LDADD =  \

src/rahunasd.c

@@ -15 +15 @@
 #include <errno.h>
 #include <unistd.h>
-#include <time.h>
 #include <signal.h>
 #include <syslog.h>
@@ -24 +23 @@
 #include "rh-ipset.h"
 #include "rh-utils.h"
+#include "rh-task.h"
 
 /* Abstract functions */
 int logmsg(int priority, const char *msg, ...); 
 int getline(int fd, char *buf, size_t size);
-int finish();
-int ipset_flush();
-
-struct rahunas_map* rh_init_map();
-int rh_init_members(struct rahunas_map *map);
-
-int walk_through_set (int (*callback)(void *));
+
 size_t expired_check(void *data);
-size_t nas_reboot(void *data);
 
 /* Declaration */
@@ -163 +156 @@
     case SIGKILL:
       if (pid == 0) {
-        walk_through_set(&nas_reboot);
         rh_exit();
         exit(EXIT_SUCCESS);
@@ -174 +166 @@
       break;
   }
-}
-
-int ipset_flush()
-{
-  syslog(LOG_NOTICE, "Flushing IPSET...");
-  set_flush(SET_NAME);
-}
-
-int finish()
-{
-  char *exitmsg = "Exit Gracefully";
-        struct rahunas_member *members = NULL;
-        int i;
-  int end;
-
-  if (map) {
-    if (map->members) {
-      members = map->members;
-      end = map->size;
-    } else {
-      end = 0;
-    }  
-
-          for (i=0; i < end; i++) {
-                          rh_free_member(&members[i]);
-                }
-
-                rh_free(&(map->members));
-                rh_free(&map);
-        }
-
-  rh_free(&rahunas_set);
-        syslog(LOG_INFO, exitmsg);
-  return 0;
 }
 
@@ -233 +191 @@
 }
 
-struct rahunas_map* rh_init_map() {
-  struct rahunas_map *map = NULL;
-
-        map = (struct rahunas_map*)(rh_malloc(sizeof(struct rahunas_map)));
-
-  map->members = NULL;
-        map->size = 0;
-
-        return map;
-}
-
-int rh_init_members (struct rahunas_map* map)
-{
-        struct rahunas_member *members = NULL;
-        int size;
-
-  if (!map)
-          return (-1);
-        
-        size = map->size == 0 ? MAX_MEMBERS : map->size;
-
-        members = 
-    (struct rahunas_member*)(rh_malloc(sizeof(struct rahunas_member)*size));
-
-        memset(members, 0, sizeof(struct rahunas_member)*size);
-
-        map->members = members;
-
-        return 0;
-}
-
 gboolean polling(gpointer data) {
   struct rahunas_map *map = (struct rahunas_map *)data;
@@ -278 +205 @@
   struct ip_set_rahunas *table = NULL;
   struct rahunas_member *members = map->members;
+  struct task_req req;
   unsigned int i;
   char *ip = NULL;
-  ip_set_ip_t current_ip;
   int res  = 0;
 
@@ -289 +216 @@
  
   for (i = 0; i < map->size; i++) {
-    if (test_bit(IPSET_RAHUNAS_ISSET,
-          (void *)&table[i].flags)) {
-      if ((time(NULL) - table[i].timestamp) > IDLE_THRESHOLD) {
+    if (test_bit(IPSET_RAHUNAS_ISSET, (void *)&table[i].flags) && 
+          (time(NULL) - table[i].timestamp) > IDLE_THRESHOLD) {
         DP("Found IP: %s expired", idtoip(map, i));
-        current_ip = ntohl(map->first_ip) + i;
-        res = set_adtip_nb(rahunas_set, &current_ip, &table[i].ethernet,
-                           IP_SET_OP_DEL_IP);  
-        DP("set_adtip_nb() res=%d errno=%d", res, errno);
-
-        if (res == 0) {
-                            send_xmlrpc_stopacct(map, i, RH_RADIUS_TERM_IDLE_TIMEOUT);
-
-          if (!members[i].username)
-            members[i].username = termstring;
-
-          if (!members[i].session_id)
-            members[i].session_id = termstring;
-
-          logmsg(RH_LOG_NORMAL, "Session Idle-Timeout, User: %s, IP: %s, "
-                                "Session ID: %s, MAC: %s",
-                                members[i].username, 
-                                idtoip(map, i), 
-                                members[i].session_id,
-                                mac_tostring(members[i].mac_address)); 
-
-          rh_free_member(&members[i]);
-        }
-      } 
+        req.id = i;
+        memcpy(req.mac_address, &table[i].ethernet, ETH_ALEN);
+        req.req_opt = RH_RADIUS_TERM_IDLE_TIMEOUT;
+                          send_xmlrpc_stopacct(map, i, RH_RADIUS_TERM_IDLE_TIMEOUT);
+        res = rh_task_stopsess(map, &req);
     }
   }
 }
 
-size_t nas_reboot(void *data)
-{
-  struct ip_set_list *setlist = (struct ip_set_list *) data;
-  struct set *set = set_list[setlist->index];
-  size_t offset;
-  struct ip_set_rahunas *table = NULL;
-  struct rahunas_member *members = map->members;
-  unsigned int i;
-  char *ip = NULL;
-  ip_set_ip_t current_ip;
-  int res  = 0;
-
-  offset = sizeof(struct ip_set_list) + setlist->header_size;
-  table = (struct ip_set_rahunas *)(data + offset);
-
-  DP("Map size %d", map->size);
- 
-  for (i = 0; i < map->size; i++) {
-    if (test_bit(IPSET_RAHUNAS_ISSET, (void *)&table[i].flags)) {
-      DP("Found IP: %s in set, try logout", idtoip(map, i));
-      current_ip = ntohl(map->first_ip) + i;
-      res = set_adtip_nb(rahunas_set, &current_ip, &table[i].ethernet,
-                         IP_SET_OP_DEL_IP);  
-      DP("set_adtip_nb() res=%d errno=%d", res, errno);
-
-      if (res == 0) {
-                            send_xmlrpc_stopacct(map, i, RH_RADIUS_TERM_NAS_REBOOT);
-
-        if (!members[i].username)
-          members[i].username = termstring;
-
-        if (!members[i].session_id)
-          members[i].session_id = termstring;
-
-        logmsg(RH_LOG_NORMAL, "Session Stop (NAS Reboot), User: %s, IP: %s, "
-                              "Session ID: %s, MAC: %s",
-                              members[i].username, 
-                              idtoip(map, i), 
-                              members[i].session_id,
-                              mac_tostring(members[i].mac_address)); 
-
-        rh_free_member(&members[i]);
-      }
-    }
-  }
-}
-
-int get_header_from_set ()
-{
-  struct ip_set_req_rahunas_create *header = NULL;
-  void *data = NULL;
-  ip_set_id_t idx;
-  socklen_t size, req_size;
-  size_t offset;
-  int res = 0;
-        in_addr_t first_ip;
-        in_addr_t last_ip;
-
-  size = req_size = load_set_list(SET_NAME, &idx, 
-                                  IP_SET_OP_LIST_SIZE, CMD_LIST); 
-
-  DP("Get Set Size: %d", size);
-  
-  if (size) {
-    data = rh_malloc(size);
-    ((struct ip_set_req_list *) data)->op = IP_SET_OP_LIST;
-    ((struct ip_set_req_list *) data)->index = idx;
-    res = kernel_getfrom_handleerrno(data, &size);
-    DP("get_lists getsockopt() res=%d errno=%d", res, errno);
-
-    if (res != 0 || size != req_size) {
-      free(data);
-      return -EAGAIN;
-    }
-    size = 0;
-  }
-
-  offset = sizeof(struct ip_set_list);
-  header = (struct ip_set_req_rahunas_create *) (data + offset);
-
-  first_ip = htonl(header->from); 
-  last_ip = htonl(header->to); 
-  
-  memcpy(&map->first_ip, &first_ip, sizeof(in_addr_t));
-  memcpy(&map->last_ip, &last_ip, sizeof(in_addr_t));
-        map->size = ntohl(map->last_ip) - ntohl(map->first_ip) + 1;
-
-        logmsg(RH_LOG_NORMAL, "First IP: %s", ip_tostring(ntohl(map->first_ip)));
-        logmsg(RH_LOG_NORMAL, "Last  IP: %s", ip_tostring(ntohl(map->last_ip)));
-        logmsg(RH_LOG_NORMAL, "Set Size: %lu", map->size);
-
-  rh_free(&data);
-  return res;
-}
-
-int walk_through_set (int (*callback)(void *))
-{
-  void *data = NULL;
-  ip_set_id_t idx;
-  socklen_t size, req_size;
-  int res = 0;
-
-  size = req_size = load_set_list(SET_NAME, &idx, 
-                                  IP_SET_OP_LIST_SIZE, CMD_LIST); 
-
-  DP("Get Set Size: %d", size);
-  
-  if (size) {
-    data = rh_malloc(size);
-    ((struct ip_set_req_list *) data)->op = IP_SET_OP_LIST;
-    ((struct ip_set_req_list *) data)->index = idx;
-    res = kernel_getfrom_handleerrno(data, &size);
-    DP("get_lists getsockopt() res=%d errno=%d", res, errno);
-
-    if (res != 0 || size != req_size) {
-      free(data);
-      return -EAGAIN;
-    }
-    size = 0;
-  }
-  
-  if (data != NULL)
-    (*callback)(data);
-
-  rh_free(&data);
-  return res;
-}
-
 void rh_exit()
 {
   syslog(LOG_ALERT, "Child Exiting ..");
-  ipset_flush();
-  finish();
+  rh_task_stopservice(map);
+  rh_task_cleanup();
   rh_closelog(DEFAULT_LOG);
 }
@@ -577 +356 @@
   dup2(fd_log, STDERR_FILENO);
 
+  sprintf(version, "Starting %s - Version %s", PROGRAM, VERSION);
+        logmsg(RH_LOG_NORMAL, version);
+  syslog(LOG_INFO, version);
+
+  rh_task_init();
+
   gnet_init();
   main_loop = g_main_loop_new (NULL, FALSE);
 
-  sprintf(version, "Starting %s - Version %s", PROGRAM, VERSION);
-
-  
-        logmsg(RH_LOG_NORMAL, version);
-  syslog(LOG_INFO, version);
-
-  rahunas_set = set_adt_get(SET_NAME);
-  DP("getsetname: %s", rahunas_set->name);
-  DP("getsetid: %d", rahunas_set->id);
-  DP("getsetindex: %d", rahunas_set->index);
-
-  map = rh_init_map();
-  get_header_from_set();
-  rh_init_members(map);
-
   /* XML RPC Server */
         server = gnet_xmlrpc_server_new (addr, port);
@@ -600 +370 @@
         if (!server) {
     syslog(LOG_ERR, "Could not start XML-RPC server!");
-    ipset_flush();
-    finish(); 
+    rh_task_stopservice(map);
           exit (EXIT_FAILURE);
         }
@@ -622 +391 @@
   g_timeout_add_seconds (POLLING, polling, map);
 
+  rh_task_startservice(map);
+
         g_main_loop_run(main_loop);
 

src/rahunasd.h

@@ -8 +8 @@
 #define __RAHUNASD_H
 
+
 #include <stdio.h>
 #include <sys/socket.h>
@@ -14 +15 @@
 #include <time.h>
 #include <linux/if_ether.h>
+#include <errno.h>
+
+#include "rh-config.h"
+#include "rh-utils.h"
 
 #define PROGRAM "RahuNASd"
@@ -19 +24 @@
 #define MAX_MEMBERS 0x00FFFF
 
-/* Configuration */
-#define DEFAULT_LOG "/var/log/rahunas/rahunas.log"
-#define DEFAULT_PID "/var/run/rahunasd.pid"
-
-#ifdef RH_DEBUG
-#  define IDLE_THRESHOLD 30
-#  define POLLING 15 
-#else
-#  define IDLE_THRESHOLD 600
-#  define POLLING 60 
-#endif
-
-#define SET_NAME "rahunas_set"
-#define XMLSERVICE_HOST "localhost"
-#define XMLSERVICE_PORT 8888
-#define XMLSERVICE_URL  "/xmlrpc_service.php"
+extern struct rahunas_map *map;
+extern struct set *rahunas_set;
+extern const char *termstring; 
 
 enum RH_LOG {
@@ -75 +67 @@
 void rh_free_member (struct rahunas_member *member);
 
-static char *timemsg()
+static const char *timemsg()
 {
   static char tmsg[32] = "";

src/rh-ipset.c

@@ -12 +12 @@
 #include "rh-ipset.h"
 #include "rh-utils.h"
-
-extern struct set **set_list;
-extern ip_set_id_t max_sets;
 
 int kernel_getsocket(void)
@@ -256 +253 @@
 }
 
-
 void set_flush(const char *name)
 {
@@ -350 +346 @@
         return size;
 }
+
+int get_header_from_set (struct rahunas_map *map)
+{
+  struct ip_set_req_rahunas_create *header = NULL;
+  void *data = NULL;
+  ip_set_id_t idx;
+  socklen_t size, req_size;
+  size_t offset;
+  int res = 0;
+        in_addr_t first_ip;
+        in_addr_t last_ip;
+
+  size = req_size = load_set_list(SET_NAME, &idx, 
+                                  IP_SET_OP_LIST_SIZE, CMD_LIST); 
+
+  DP("Get Set Size: %d", size);
+  
+  if (size) {
+    data = rh_malloc(size);
+    ((struct ip_set_req_list *) data)->op = IP_SET_OP_LIST;
+    ((struct ip_set_req_list *) data)->index = idx;
+    res = kernel_getfrom_handleerrno(data, &size);
+    DP("get_lists getsockopt() res=%d errno=%d", res, errno);
+
+    if (res != 0 || size != req_size) {
+      free(data);
+      return -EAGAIN;
+    }
+    size = 0;
+  }
+
+  offset = sizeof(struct ip_set_list);
+  header = (struct ip_set_req_rahunas_create *) (data + offset);
+
+  first_ip = htonl(header->from); 
+  last_ip = htonl(header->to); 
+  
+  memcpy(&map->first_ip, &first_ip, sizeof(in_addr_t));
+  memcpy(&map->last_ip, &last_ip, sizeof(in_addr_t));
+        map->size = ntohl(map->last_ip) - ntohl(map->first_ip) + 1;
+
+        logmsg(RH_LOG_NORMAL, "First IP: %s", ip_tostring(ntohl(map->first_ip)));
+        logmsg(RH_LOG_NORMAL, "Last  IP: %s", ip_tostring(ntohl(map->last_ip)));
+        logmsg(RH_LOG_NORMAL, "Set Size: %lu", map->size);
+
+  rh_free(&data);
+  return res;
+}
+
+int walk_through_set (int (*callback)(void *))
+{
+  void *data = NULL;
+  ip_set_id_t idx;
+  socklen_t size, req_size;
+  int res = 0;
+
+  size = req_size = load_set_list(SET_NAME, &idx, 
+                                  IP_SET_OP_LIST_SIZE, CMD_LIST); 
+
+  DP("Get Set Size: %d", size);
+  
+  if (size) {
+    data = rh_malloc(size);
+    ((struct ip_set_req_list *) data)->op = IP_SET_OP_LIST;
+    ((struct ip_set_req_list *) data)->index = idx;
+    res = kernel_getfrom_handleerrno(data, &size);
+    DP("get_lists getsockopt() res=%d errno=%d", res, errno);
+
+    if (res != 0 || size != req_size) {
+      free(data);
+      return -EAGAIN;
+    }
+    size = 0;
+  }
+  
+  if (data != NULL)
+    (*callback)(data);
+
+  rh_free(&data);
+  return res;
+}

src/rh-ipset.h

@@ -15 +15 @@
 #define GETSOCK_TRIES 5
 #define LIST_TRIES 5
+
+extern struct set **set_list;
+extern ip_set_id_t max_sets;
 
 /* The view of an ipset in userspace */
@@ -82 +85 @@
                             unsigned op, unsigned cmd);
 
+int get_header_from_set (struct rahunas_map *map);
+
+int walk_through_set (int (*callback)(void *));
+
 void parse_ip(const char *str, ip_set_ip_t *ip);
 void parse_mac(const char *mac, unsigned char *ethernet);

src/rh-utils.c

@@ -7 +7 @@
 #include <syslog.h>
 #include <glib.h>
+#include <time.h>
 
 #include "rh-utils.h"

src/rh-utils.h

@@ -14 +14 @@
 const char *rh_string_get_sep(const char *haystack, const char *sep, 
                               unsigned short idx);
-
 #endif // __RH_UTILS_H

src/rh-xmlrpc-server.c

@@ -2 +2 @@
  * RahuNAS XML-RPC Server implementation
  * Author: Neutron Soutmun <neo.neutron@gmail.com>
+ *         Suriya Soutmun <darksolar@gmail.com>
  * Date:   2008-08-07
  */
@@ -9 +10 @@
 #include "rahunasd.h"
 #include "rh-xmlrpc-server.h"
+#include "rh-radius.h"
 #include "rh-ipset.h"
 #include "rh-utils.h"
-
-extern struct set *rahunas_set;
+#include "rh-task.h"
+
 extern const char* termstring;
 
@@ -24 +26 @@
         struct rahunas_member *members = NULL;
   unsigned char ethernet[ETH_ALEN] = {0,0,0,0,0,0};
+  struct task_req req;
         gchar *ip = NULL;
         gchar *username = NULL;
@@ -29 +32 @@
   gchar *mac_address = NULL;
         uint32_t id;
-  int res = 0;
 
         if (!map)
@@ -58 +60 @@
         }
 
-  res = set_adtip(rahunas_set, ip, mac_address, IP_SET_OP_ADD_IP);
-  if (res == 0) {
-    members[id].flags = 1;
-    if (members[id].username && members[id].username != termstring)
-      free(members[id].username);
-
-    if (members[id].session_id && members[id].username != termstring)
-      free(members[id].session_id);
-
-    members[id].username   = strdup(username);
-    if (!members[id].username)
-      members[id].username = termstring;
-
-    members[id].session_id = strdup(session_id);
-    if (!members[id].session_id)
-      members[id].session_id = termstring;
-
-                time(&(members[id].session_start));
-
-    parse_mac(mac_address, &ethernet);
-    memcpy(&members[id].mac_address, &ethernet, ETH_ALEN);
-
-    logmsg(RH_LOG_NORMAL, "Session Start, User: %s, IP: %s, "
-                          "Session ID: %s, MAC: %s",
-                          members[id].username, 
-                          idtoip(map, id), 
-                          members[id].session_id,
-                          mac_tostring(members[id].mac_address)); 
-
-  } else if (res == RH_IS_IN_SET) {
-    members[id].flags = 1;
-  }
+  req.id = id;
+  req.username = username;
+  req.session_id = session_id;
+  parse_mac(mac_address, &ethernet);
+  memcpy(req.mac_address, &ethernet, ETH_ALEN);
+
+  rh_task_startsess(map, &req);
 
   *reply_string = g_strdup_printf("Greeting! Got: IP %s, User %s, ID %s", 
@@ -116 +93 @@
   struct rahunas_map *map = (struct rahunas_map *)user_data;
         struct rahunas_member *members;
+  struct task_req req;
         gchar *ip = NULL;
         gchar *mac_address = NULL;
@@ -148 +126 @@
         }
 
+  req.id = id;
+  parse_mac(mac_address, &ethernet);
+  memcpy(req.mac_address, &ethernet, ETH_ALEN);
+  req.req_opt = RH_RADIUS_TERM_USER_REQUEST;
+
         if (members[id].flags) {
-    parse_mac(mac_address, &ethernet);
     if (memcmp(&ethernet, &members[id].mac_address, ETH_ALEN) == 0) {
-      res = set_adtip(rahunas_set, idtoip(map, id), mac_address,
-                      IP_SET_OP_DEL_IP);
+      res = rh_task_stopsess(map, &req);
       if (res == 0) {
-        if (!members[id].username)
-          members[id].username = termstring;
-
-        if (!members[id].session_id)
-          members[id].session_id = termstring;
-
-        logmsg(RH_LOG_NORMAL, "Session Stop, User: %s, IP: %s, "
-                              "Session ID: %s, MAC: %s",
-                              members[id].username, 
-                              idtoip(map, id), 
-                              members[id].session_id,
-                              mac_tostring(members[id].mac_address)); 
-
-        rh_free_member(&members[id]);   
- 
         *reply_string = g_strdup_printf("Client IP %s was removed!", 
                                                           idtoip(map, id));