Changeset 4b5d05b46785f944e0d4ba506afeb9df499a6aac

Timestamp:

06/21/11 11:08:58 (11 months ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

0689196636498f5ef2219550ec79bf0f7c40aa41

Parents:

cb5371333692435b9818b9043a26980e404202d1

git-committer:

Neutron Soutmun <neo.neutron@…> (06/21/11 11:08:58)

Message:

Fix compiler warnings

• src/rahunasd.c:
  • Declare termstring = "" instead.
• src/rh-ipset.{h, c}:
  • Declare unsigned variable as unsigned int instead.
• src/rh-ipset.c (set_ipiphash_adtip):
  • Fix typo which should call set_ipiphash_adtip_nb() instead.
• src/rh-serviceclass.c, src/rh-task-serviceclass.c:
  • Include string.h to fix the compiler warnings.
• src/rh-serviceclass.{h,c}:
  • Replace struct main_server and struct serviceclass with RHMainServer and RHSvClass respectively.
• src/rh-task-ipset.c (set_cleanup):
  • Fix wrong type casting.
• src/rh-task-memset.c (startsess):
  • Fix compiler warnnings on assigning "const char *" to "char *" variable.
• src/rh-task-serviceclass.c:
  • Fix compiler warnnings on rh_free().
  • Free member->mapping_ip before assign new data.
• src/Makefile.am:
  • Add src/ipset/*.h headers to makefile which they should included in tarball.

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• rahunasd.c (modified) (1 diff)
• rh-ipset.c (modified) (6 diffs)
• rh-ipset.h (modified) (3 diffs)
• rh-serviceclass.c (modified) (16 diffs)
• rh-serviceclass.h (modified) (2 diffs)
• rh-task-ipset.c (modified) (1 diff)
• rh-task-memset.c (modified) (2 diffs)
• rh-task-serviceclass.c (modified) (3 diffs)

src/Makefile.am

@@ -29 +29 @@
   rh-xmlrpc-cmd.c \
   rh-xmlrpc-cmd.h \
+  ipset/ip_set_bitmaps.h \
+  ipset/ip_set_hashes.h \
+  ipset/ip_set_rahunas_ipiphash.h \
+  ipset/ip_set.h \
+  ipset/ip_set_rahunas.h \
   rh-ipset.c \
   rh-ipset.h \

src/rahunasd.c

@@ -24 +24 @@
 #include "rh-task.h"
 
-const char *termstring = '\0';
+const char *termstring = "";
 pid_t pid, sid;
 

src/rh-ipset.c

@@ -86 +86 @@
 }
 
-int kernel_sendto_handleerrno(unsigned op, void *data, socklen_t size)
+int kernel_sendto_handleerrno(unsigned int op, void *data, socklen_t size)
 {
   int res = wrapped_setsockopt(data, size);
@@ -230 +230 @@
 
 int set_adtip(struct set *rahunas_set, const char *adtip, const char *adtmac, 
-              unsigned op)
+              unsigned int op)
 {
   ip_set_ip_t ip;
@@ -241 +241 @@
 
 int set_adtip_nb(struct set *rahunas_set, ip_set_ip_t *adtip, 
-                 unsigned char adtmac[ETH_ALEN], unsigned op)
+                 unsigned char adtmac[ETH_ALEN], unsigned int op)
 {
   struct ip_set_req_adt *req_adt = NULL;
@@ -300 +300 @@
 
 int set_ipiphash_adtip(struct set *rahunas_set, const char *ip,
-                       const char *ip1, unsigned op)
+                       const char *ip1, unsigned int op)
 {
   ip_set_ip_t _ip;
@@ -307 +307 @@
   parse_ip(ip1, &_ip1);
 
-  return set_adtip_nb(rahunas_set, &_ip, &_ip1, op);
+  return set_ipiphash_adtip_nb(rahunas_set, &_ip, &_ip1, op);
 }
 
 int set_ipiphash_adtip_nb(struct set *rahunas_set, ip_set_ip_t *ip,
-                          ip_set_ip_t *ip1, unsigned op)
+                          ip_set_ip_t *ip1, unsigned int op)
 {
   struct ip_set_req_adt *req_adt = NULL;
@@ -384 +384 @@
 size_t load_set_list(RHVServer *vs, const char name[IP_SET_MAXNAMELEN],
           ip_set_id_t *idx,
-          unsigned op, unsigned cmd)
+          unsigned int op, unsigned int cmd)
 {
   void *data = NULL;

src/rh-ipset.h

@@ -24 +24 @@
   ip_set_id_t id;       /* Unique set id */
   ip_set_id_t index;      /* Array index */
-  unsigned ref;       /* References in kernel */
+  unsigned int ref;       /* References in kernel */
   struct settype *settype;    /* Pointer to set type functions */
 };
@@ -75 +75 @@
 int wrapped_setsockopt(void *data, socklen_t size);
 void kernel_getfrom(void *data, socklen_t * size);
-int kernel_sendto_handleerrno(unsigned op, void *data, socklen_t size);
+int kernel_sendto_handleerrno(unsigned int op, void *data, socklen_t size);
 void kernel_sendto(void *data, size_t size);
 int kernel_getfrom_handleerrno(void *data, socklen_t * size);
 struct set *set_adt_get(const char *name);
 int set_adtip(struct set *rahunas_set, const char *adtip, const char *adtmac, 
-              unsigned op);
+              unsigned int op);
 
 int set_adtip_nb(struct set *rahunas_set, ip_set_ip_t *adtip, 
-                 unsigned char adtmac[ETH_ALEN], unsigned op);
+                 unsigned char adtmac[ETH_ALEN], unsigned int op);
 
 int set_ipiphash_adtip(struct set *rahunas_set, const char *ip,
-                       const char *ip1, unsigned op);
+                       const char *ip1, unsigned int op);
 int set_ipiphash_adtip_nb(struct set *rahunas_set, ip_set_ip_t *ip,
-                          ip_set_ip_t *ip1, unsigned op);
+                          ip_set_ip_t *ip1, unsigned int op);
 
 void set_flush(const char *name);
@@ -94 +94 @@
 size_t load_set_list(RHVServer *vs, const char name[IP_SET_MAXNAMELEN],
           ip_set_id_t *idx,
-          unsigned op, unsigned cmd);
+          unsigned int op, unsigned int cmd);
 
 int get_header_from_set (RHVServer *vs);

src/rh-serviceclass.c

@@ -5 +5 @@
  */
 #include <stdio.h>
+#include <string.h>
 #include <arpa/inet.h>
 #include "rahunasd.h"
@@ -11 +12 @@
 #include "rh-ipset.h"
 
-int serviceclass_do_init (struct main_server *ms, struct serviceclass *sc);
-
-struct serviceclass *serviceclass_exists(GList *serviceclass_list,
+int serviceclass_do_init (RHMainServer *ms, RHSvClass *sc);
+
+RHSvClass *serviceclass_exists(GList *serviceclass_list,
                                          int serviceclass_id,
                                          const char *serviceclass_name)
 {
   GList *runner = g_list_first(serviceclass_list);
-  struct serviceclass *lserviceclass = NULL;
-
-  while (runner != NULL) {
-    lserviceclass = (struct serviceclass *)runner->data;
+  RHSvClass *lserviceclass = NULL;
+
+  while (runner != NULL) {
+    lserviceclass = (RHSvClass *)runner->data;
 
     if (lserviceclass->serviceclass_config->serviceclass_id == serviceclass_id)
@@ -35 +36 @@
 }
 
-struct servicclass *serviceclass_get_by_id(struct main_server *ms,
-                                           int search_id)
+RHSvClass *serviceclass_get_by_id(RHMainServer *ms, int search_id)
 {
   GList *runner = g_list_first(ms->serviceclass_list);
-  struct serviceclass *lserviceclass = NULL;
-
-  while (runner != NULL) {
-    lserviceclass = (struct serviceclass *)runner->data;
+  RHSvClass *lserviceclass = NULL;
+
+  while (runner != NULL) {
+    lserviceclass = (RHSvClass *)runner->data;
 
     if (lserviceclass->serviceclass_config->serviceclass_id == search_id) {
@@ -53 +53 @@
 }
 
-int serviceclass_cleanup(struct serviceclass *sc)
+int serviceclass_cleanup(RHSvClass *sc)
 {
   if (sc == NULL)
@@ -64 +64 @@
 }
 
-int register_serviceclass(struct main_server *ms,
+int register_serviceclass(RHMainServer *ms,
                           const char *serviceclass_cfg_file)
 {
@@ -73 +73 @@
   union rahunas_config *cfg_get = NULL;
   struct rahunas_serviceclass_config *serviceclass_config = NULL;
-  struct serviceclass *new_serviceclass = NULL;
-  struct serviceclass *old_serviceclass = NULL;
+  RHSvClass *new_serviceclass = NULL;
+  RHSvClass *old_serviceclass = NULL;
 
   union rahunas_config config = {
@@ -99 +99 @@
       if (old_serviceclass->dummy_config != NULL) {
         DP("Cleanup old dummy config");
-        rh_free(&old_serviceclass->dummy_config);
+        rh_free((void **) &old_serviceclass->dummy_config);
       }
 
@@ -134 +134 @@
   memcpy(serviceclass_config, &config, sizeof(struct rahunas_serviceclass_config));
 
-  new_serviceclass = (struct serviceclass *) rh_malloc(sizeof(struct serviceclass));
+  new_serviceclass = (RHSvClass *) rh_malloc(sizeof(RHSvClass));
 
   if (new_serviceclass == NULL)
     return -1;
 
-  memset(new_serviceclass, 0, sizeof(struct serviceclass));
+  memset(new_serviceclass, 0, sizeof(RHSvClass));
 
   new_serviceclass->serviceclass_config = serviceclass_config;
@@ -148 +148 @@
 }
 
-int unregister_serviceclass(struct main_server *ms, int serviceclass_id)
-{
-  GList *serviceclass_list = ms->serviceclass_list;
-  GList *runner = g_list_first(serviceclass_list);
-  struct serviceclass *lserviceclass = NULL;
-
-  while (runner != NULL) {
-    lserviceclass = (struct serviceclass *)runner->data;
+int unregister_serviceclass(RHMainServer *ms, int serviceclass_id)
+{
+  GList *serviceclass_list = ms->serviceclass_list;
+  GList *runner = g_list_first(serviceclass_list);
+  RHSvClass *lserviceclass = NULL;
+
+  while (runner != NULL) {
+    lserviceclass = (RHSvClass *)runner->data;
     if (lserviceclass->serviceclass_config->serviceclass_id == serviceclass_id) {
       serviceclass_cleanup(lserviceclass);
@@ -168 +168 @@
 }
 
-int unregister_serviceclass_all(struct main_server *ms)
+int unregister_serviceclass_all(RHMainServer *ms)
 {
   GList *serviceclass_list = ms->serviceclass_list;
   GList *runner = g_list_first(serviceclass_list);
   GList *deleting = NULL;
-  struct serviceclass *lserviceclass = NULL;
-
-  while (runner != NULL) {
-    lserviceclass = (struct serviceclass *)runner->data;
+  RHSvClass *lserviceclass = NULL;
+
+  while (runner != NULL) {
+    lserviceclass = (RHSvClass *)runner->data;
     serviceclass_cleanup(lserviceclass);
     deleting = runner;
@@ -188 +188 @@
 }
 
-int walk_through_serviceclass(int (*callback)(void *, void *), struct main_server *ms)
-{
-  GList *serviceclass_list = ms->serviceclass_list;
-  GList *runner = g_list_first(serviceclass_list);
-  struct serviceclass *sc = NULL;
-
-  while (runner != NULL) {
-    sc = (struct serviceclass *)runner->data;
+int walk_through_serviceclass(int (*callback)(void *, void *), RHMainServer *ms)
+{
+  GList *serviceclass_list = ms->serviceclass_list;
+  GList *runner = g_list_first(serviceclass_list);
+  RHSvClass *sc = NULL;
+
+  while (runner != NULL) {
+    sc = (RHSvClass *)runner->data;
 
     (*callback)(ms, sc);
@@ -205 +205 @@
 }
 
-void serviceclass_init(struct main_server *ms, struct serviceclass *sc)
+void serviceclass_init(RHMainServer *ms, RHSvClass *sc)
 {
   struct rahunas_serviceclass_config *sc_config = NULL;
@@ -221 +221 @@
 }
 
-void serviceclass_reload(struct main_server *ms, struct serviceclass *sc)
+void serviceclass_reload(RHMainServer *ms, RHSvClass *sc)
 {
   if (sc->serviceclass_config->init_flag == SC_DONE) {
@@ -257 +257 @@
         memcpy(sc->serviceclass_config, sc->dummy_config,
           sizeof(struct rahunas_serviceclass_config));
-        rh_free(&sc->dummy_config);
+        rh_free((void **) &sc->dummy_config);
       }
 
@@ -269 +269 @@
 
 
-void serviceclass_unused_cleanup(struct main_server *ms)
-{
-  GList *serviceclass_list = ms->serviceclass_list;
-  GList *runner = g_list_first(serviceclass_list);
-  struct serviceclass *lserviceclass = NULL;
-
-  while (runner != NULL) {
-    lserviceclass = (struct serviceclass *)runner->data;
+void serviceclass_unused_cleanup(RHMainServer *ms)
+{
+  GList *serviceclass_list = ms->serviceclass_list;
+  GList *runner = g_list_first(serviceclass_list);
+  RHSvClass *lserviceclass = NULL;
+
+  while (runner != NULL) {
+    lserviceclass = (RHSvClass *)runner->data;
     if (lserviceclass->serviceclass_config->init_flag == SC_NONE) {
       logmsg(RH_LOG_NORMAL, "[%s] - Service class config removed",
@@ -290 +290 @@
 }
 
-int serviceclass_do_init (struct main_server *ms, struct serviceclass *sc)
+int serviceclass_do_init (RHMainServer *ms, RHSvClass *sc)
 {
   struct rahunas_serviceclass_config *sc_config = sc->serviceclass_config;

src/rh-serviceclass.h

@@ -8 +8 @@
 
 #include <glib.h>
+#include "rh-server.h"
 #include "rh-config.h"
 
@@ -20 +21 @@
 
 
-struct serviceclass *serviceclass_exists(GList *serviceclass_list,
-                                         int serviceclass_id,
-                                         const char *servicclass_name);
+RHSvClass *serviceclass_exists    (GList *serviceclass_list,
+                                   int serviceclass_id,
+                                   const char *serviceclass_name);
 
-struct servicclass *serviceclass_get_by_id(struct main_server *ms,
-                                           int search_id);
-int serviceclass_cleanup(struct serviceclass *sc);
+RHSvClass *serviceclass_get_by_id (RHMainServer *ms, int search_id);
+int serviceclass_cleanup          (RHSvClass *sc);
 
-int register_serviceclass(struct main_server *ms,
-                          const char *serviceclass_cfg_file);
-int unregister_serviceclass(struct main_server *ms, int serviceclass_id);
-int unregister_serviceclass_all(struct main_server *ms);
+int register_serviceclass         (RHMainServer *ms,
+                                   const char *serviceclass_cfg_file);
+int unregister_serviceclass       (RHMainServer *ms, int serviceclass_id);
+int unregister_serviceclass_all   (RHMainServer *ms);
 
-void serviceclass_init(struct main_server *ms, struct serviceclass *sc);
-void serviceclass_reload(struct main_server *ms, struct serviceclass *sc);
-void serviceclass_unused_cleanup(struct main_server *ms);
+void serviceclass_init            (RHMainServer *ms, RHSvClass *sc);
+void serviceclass_reload          (RHMainServer *ms, RHSvClass *sc);
+void serviceclass_unused_cleanup  (RHMainServer *ms);
 
 #endif // __RH_SERVICECLASS_H

src/rh-task-ipset.c

@@ -32 +32 @@
 
   offset = sizeof(struct ip_set_list) + setlist->header_size;
-  table = (struct ip_set_rahunas *)(process->list + offset);
+  table = (struct ip_set_rahu *)(process->list + offset);
 
   while (runner != NULL) {

src/rh-task-memset.c

@@ -155 +155 @@
     free(member->serviceclass_name);
 
-  if (member->mapping_ip && member->mapping_ip != termstring)
-    free(member->mapping_ip);
+  if (member->mapping_ip)
+    {
+      free(member->mapping_ip);
+      member->mapping_ip = NULL;
+    }
 
   member->username   = strdup(req->username);
@@ -169 +172 @@
   member->serviceclass_description = termstring;
   member->serviceclass_slot_id = 0;
-  member->mapping_ip = termstring;
+  member->mapping_ip = strdup(termstring);
 
   if (req->session_start == 0) {

src/rh-task-serviceclass.c

@@ -5 +5 @@
  */
 
+#include <string.h>
 #include <syslog.h>
 #include <libgda/libgda.h>
@@ -86 +87 @@
     logmsg(RH_LOG_NORMAL, "Service Class: Flushing set ...");
     set_flush (SERVICECLASS_SET_NAME);
-    rh_free(&rh_serviceclass_set);
+    rh_free((void **) &rh_serviceclass_set);
   }
 
@@ -160 +161 @@
     member->serviceclass_description = sc_config->description;
     member->serviceclass_slot_id = req->serviceclass_slot_id;
+
+    if (member->mapping_ip)
+      {
+        free (member->mapping_ip);
+        member->mapping_ip = NULL;
+      }
 
     member->mapping_ip = strdup (ip_tostring(ip1));