Changeset 169 for trunk/src/sh_portcheck.c

Timestamp:

Apr 13, 2008, 9:59:55 PM (17 years ago)

Author:

katerina

Message:

Fixes for tickes #93 to #104 (yes, big commit, bad, bad,...).

File:

• trunk/src/sh_portcheck.c (modified) (12 diffs)

trunk/src/sh_portcheck.c

@@ -384 +384 @@
           if (ptr->flag != SH_PORT_OPT && ptr->flag != SH_PORT_IGN)
             {
-              snprintf (errbuf, sizeof(errbuf), _("POLICY [ServiceMissing] port %s:%d/%s (%s)"), 
+              snprintf (errbuf, sizeof(errbuf), _("port: %s:%d/%s (%s)"), 
                         ptr->interface, ptr->port, SH_PROTO_STR(proto), 
                         ptr->service ? ptr->service : check_services(ptr->port, proto));
@@ -395 +395 @@
                   SH_MUTEX_LOCK(mutex_thread_nolog);
                   sh_error_handle(sh_portchk_severity, FIL__, __LINE__, 0, 
-                                  MSG_PORT_REPORT, errbuf);
+                                  MSG_PORT_MISS, errbuf);
                   SH_MUTEX_UNLOCK(mutex_thread_nolog);
                 }
@@ -497 +497 @@
       if (!portent)
         {
-          snprintf (errbuf, sizeof(errbuf), _("POLICY [ServiceNew] port %s:%d/%s (%s)"), 
+          snprintf (errbuf, sizeof(errbuf), _("port: %s:%d/%s (%s)"), 
                     inet_ntoa(haddr), port, SH_PROTO_STR(proto), service);
 #ifdef TEST_ONLY
@@ -505 +505 @@
           SH_MUTEX_LOCK(mutex_thread_nolog);
           sh_error_handle(sh_portchk_severity, FIL__, __LINE__, 0, 
-                          MSG_PORT_REPORT, errbuf);
+                          MSG_PORT_NEW, errbuf);
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
 #endif
@@ -515 +515 @@
       else if (portent->status == SH_PORT_MISS && portent->flag != SH_PORT_IGN)
         {
-          snprintf (errbuf, sizeof(errbuf), _("POLICY [ServiceRestarted] port %s:%d/%s to %d/%s (%s)"), 
-                    inet_ntoa(haddr), portent->port, SH_PROTO_STR(proto), port, SH_PROTO_STR(proto), service);
+          snprintf (errbuf, sizeof(errbuf), _("port: %s:%d/%s (%s), was %d/%s"), 
+                    inet_ntoa(haddr), port, SH_PROTO_STR(proto), service, portent->port, SH_PROTO_STR(proto));
 #ifdef TEST_ONLY
           fprintf(stderr, _("service: %s\n"), errbuf);
@@ -522 +522 @@
           SH_MUTEX_LOCK(mutex_thread_nolog);
           sh_error_handle(sh_portchk_severity, FIL__, __LINE__, 0, 
-                          MSG_PORT_REPORT, errbuf);
+                          MSG_PORT_RESTART, errbuf);
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
 #endif
@@ -530 +530 @@
       else if (port != portent->port && (-1) != portent->port)
         {
-          snprintf (errbuf, sizeof(errbuf), _("POLICY [ServicePortSwitch] port %s:%d/%s to %d/%s (%s)"), 
-                    inet_ntoa(haddr), portent->port, SH_PROTO_STR(proto), port, SH_PROTO_STR(proto), service);
+          snprintf (errbuf, sizeof(errbuf), _("port: %s:%d/%s (%s), was %d/%s"), 
+                    inet_ntoa(haddr), port, SH_PROTO_STR(proto), service, portent->port, SH_PROTO_STR(proto));
 #ifdef TEST_ONLY
           fprintf(stderr, _("service: %s\n"), errbuf);
@@ -537 +537 @@
           SH_MUTEX_LOCK(mutex_thread_nolog);
           sh_error_handle(sh_portchk_severity, FIL__, __LINE__, 0, 
-                          MSG_PORT_REPORT, errbuf);
+                          MSG_PORT_NEWPORT, errbuf);
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
 #endif
@@ -552 +552 @@
       if (!portent)
         {
-          snprintf (errbuf, sizeof(errbuf), _("POLICY [ServiceNew] port %s:%d/%s (%s)"), 
+          snprintf (errbuf, sizeof(errbuf), _("port: %s:%d/%s (%s)"), 
                     inet_ntoa(haddr), port, SH_PROTO_STR(proto), check_services(port, proto));
 #ifdef TEST_ONLY
@@ -560 +560 @@
           SH_MUTEX_LOCK(mutex_thread_nolog);
           sh_error_handle(sh_portchk_severity, FIL__, __LINE__, 0, 
-                          MSG_PORT_REPORT, errbuf);
+                          MSG_PORT_NEW, errbuf);
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
 #endif
@@ -570 +570 @@
       else if (portent->status == SH_PORT_MISS && portent->flag != SH_PORT_IGN)
         {
-          snprintf (errbuf, sizeof(errbuf), _("POLICY [ServiceRestarted] port %s:%d/%s (%s)"), 
+          snprintf (errbuf, sizeof(errbuf), _("port: %s:%d/%s (%s)"), 
                     inet_ntoa(haddr), port, SH_PROTO_STR(proto), check_services(port, proto));
 #ifdef TEST_ONLY
@@ -577 +577 @@
           SH_MUTEX_LOCK(mutex_thread_nolog);
           sh_error_handle(sh_portchk_severity, FIL__, __LINE__, 0, 
-                          MSG_PORT_REPORT, errbuf);
+                          MSG_PORT_RESTART, errbuf);
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
 #endif