File argus-client-codecleanup.patch of Package argus-client

Overview Repositories Revisions Requests Users Attributes Meta

File argus-client-codecleanup.patch of Package argus-client (Revision 3875c4f93e6072e8e68a95a77185618f)

Currently displaying revision 3875c4f93e6072e8e68a95a77185618f , Show latest

--- clients/rasrvstats.c
+++ clients/rasrvstats.c
@@ -1067,10 +1067,10 @@
    struct RaSrvHash RaThisSrvHash;
    unsigned short hash = 0;
 
-   hash += ((unsigned short *)&proto)[0];
-   hash += ((unsigned short *)&proto)[1];
-   hash += ((unsigned short *)&port)[0];
-   hash += ((unsigned short *)&port)[1];
+   hash += (unsigned int)proto >> 16;
+   hash += (unsigned int)proto & 0x00FF;
+   hash += (unsigned int)port >> 16;
+   hash += (unsigned int)port & 0x00FF;
 
    RaThisSrvHash.srvProto = proto;
    RaThisSrvHash.srvPort  = port;
@@ -1110,10 +1110,10 @@
       RaThisSrvHash.srvProto = store->proto;
       RaThisSrvHash.srvPort  = store->port;
 
-      hash += ((unsigned short *)&store->proto)[0];
-      hash += ((unsigned short *)&store->proto)[1];
-      hash += ((unsigned short *)&store->port)[0];
-      hash += ((unsigned short *)&store->port)[1];
+      hash += (unsigned int)store->proto >> 16;
+      hash += (unsigned int)store->proto & 0x00FF;
+      hash += (unsigned int)store->port >> 16;
+      hash += (unsigned int)store->port & 0x00FF;
 
       retn->srvhash = RaThisSrvHash;
       retn->hash = hash;
--- common/argus_filter.c
+++ common/argus_filter.c
@@ -4007,9 +4007,8 @@
    struct protoidmem *tp;
    u_char protoid[5];
 
-   protoid[0] = 0;
-   protoid[1] = 0;
-   protoid[2] = 0;
+   for(i = 0; i < 5; i++)
+      protoid[i] = 0;
 
    for (i = 0; i < ARGUS_MAXEPROTODB; i++) {
       if ((p = argus_eproto_db[i]) != NULL) {
--- common/gencode.c
+++ common/gencode.c
@@ -63,6 +63,9 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
+/* don't define ArgusNetMask in argus_parse.h */
+#define NO_ARGUSNETMASK
+
 #include <argus_client.h>
 #include <argus_filter.h>
 #include <argus_def.h>
--- include/argus_parse.h
+++ include/argus_parse.h
@@ -176,8 +176,10 @@
 
 struct ArgusRecord *initCon = NULL;
 
-unsigned int ArgusLocalNet, ArgusNetMask;
-
+unsigned int ArgusLocalNet;
+#ifndef NO_ARGUSNETMASK
+unsigned int ArgusNetMask;
+#endif
 char ArgusOriginalBuffer[MAXSTRLEN];
 struct ArgusRecord *ArgusOriginal = (struct ArgusRecord *) ArgusOriginalBuffer;
 
@@ -1519,8 +1521,10 @@
 
 extern struct ArgusRecord *initCon;
 
-extern unsigned int ArgusLocalNet, ArgusNetMask;
-
+extern unsigned int ArgusLocalNet;
+#ifndef NO_ARGUSNETMASK
+extern unsigned int ArgusNetMask;
+#endif
 extern struct ArgusRecord *ArgusOriginal;
 
 extern int totalrecords;
--- ragraph/rahistogram.c
+++ ragraph/rahistogram.c
@@ -59,7 +59,7 @@
 
 int RaLabelCounter = 0;
 int RaFirstArgusRecord = 1;
-int RaSeconds = 0;
+time_t RaSeconds = 0;
 int RaScaleSeconds = 0;
 int RaStartSeconds = 0;
 int RaEndSeconds = 0;
@@ -82,7 +82,7 @@
 void RaProcessThisSrvRecord (struct ArgusServiceRecord *);
 int RaCreateEtherFlow (struct ArgusRecord *);
 void RaModifyEtherFlow(struct ArgusRecord *);
-
+struct RaHashTableHeader *RaAddHashObject(struct RaHashTableStruct *, void *, struct RaHashStruct *);
 struct RaBinStruct **RaBinMergeArray = NULL;
 struct RaBinStruct **RaBinOldMergeArray = NULL;
 struct tm RaThisTmStructBuf, *RaThisTmStruct = &RaThisTmStructBuf;
@@ -733,7 +733,7 @@
                ArgusLog (LOG_ERR, "RaProcessSrvRecord: RaNewArgusData %s", strerror(errno));
          }
 
-         if ((store->rahtblhdr = RaAddHashObject (&RaProbeTable, (void *) key, &ArgusHash)) == NULL)
+         if ((store->rahtblhdr = RaAddHashObject (&RaProbeTable, (void *)(unsigned long)key, &ArgusHash)) == NULL)
             ArgusLog (LOG_ERR, "RaProcessSrvRecord: RaAddHashObject %s", strerror(errno));
 
          RaAddToQueue(RaProbeQueue, &store->qhdr);
@@ -2047,7 +2047,7 @@
    RaEndSeconds   = mktime(RaEndTmStruct);
    RaEndTime.tv_sec = RaEndSeconds;
    RaSeconds = RaEndTime.tv_sec - RaStartTime.tv_sec;
-   *RaThisTmStruct  = *localtime((time_t *) &RaSeconds);
+   *RaThisTmStruct  = *localtime(&RaSeconds);
 
    if ((Nflag == 0)) {
       RaScaleSeconds = RaEndSeconds - RaStartSeconds;
@@ -2691,7 +2691,7 @@
                      for (i = 0; i < RaProbeQueue->count; i++) {
                         unsigned int proto;
                         srv = (void *) RaProbeQueue->start;
-                        if ((proto = (unsigned int) srv->rahtblhdr->object) == IPPROTO_TCP)
+                        if ((proto = (unsigned int)(unsigned long) srv->rahtblhdr->object) == IPPROTO_TCP)
                            break;
                         else
                            RaProbeQueue->start = RaProbeQueue->start->nxt;
@@ -2699,7 +2699,7 @@
                      
                      fprintf (stdout, "Protos=");
                      while ((srv = (struct ArgusRecordStore *) RaPopQueue(RaProbeQueue)) != NULL) {
-                        unsigned int proto = (unsigned int) srv->rahtblhdr->object;
+                        unsigned int proto = (unsigned int) (unsigned long)srv->rahtblhdr->object;
                         fprintf (stdout, "%4.4s ", ip_proto_string[(unsigned short) proto]);
                      }
                      break;

Places

File argus-client-codecleanup.patch of Package argus-client (Revision 3875c4f93e6072e8e68a95a77185618f)

Places