Minor (if widespread) patch for clients.beta.6
carter at qosient.com
carter at qosient.com
Tue May 12 21:35:12 EDT 2009
Hey Peter,
Added, and thanks!!!!!!
If you are getting segfaults, please send any available info!!
Carter
Sent from my Verizon Wireless BlackBerry
-----Original Message-----
From: Peter Van Epp <vanepp at sfu.ca>
Date: Tue, 12 May 2009 16:37:59
To: <argus-info at lists.andrew.cmu.edu>
Subject: [ARGUS] Minor (if widespread) patch for clients.beta.6
A set of difs that print the signal number (rather than $d :-)) when
debugging is on in ra. I came across this while converting to a two machine
setup where the first (both AMD64 bit machines running 64 bit FreeBSD 7.1)
is the sensor and writing to a local file and a socket and the second is using
ra to read from the socket and store to disk which matches mostly what SFU is
running (and apparantly getting segfaults in) although at a higher speed. We'll
see if this does anything for a while. If as I expect it doesn't then it will
be time to try and set up tcpreplay (and get an appropriate pcap file :-)) to
be able to run at 200 megs or so as SFU is doing and see if that fails.
Peter Van Epp
*** common/argus_util.c.orig Tue May 12 15:23:35 2009
--- common/argus_util.c Tue May 12 15:24:08 2009
***************
*** 513,519 ****
printf("</ArgusDataStream>\n");
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 513,519 ----
printf("</ArgusDataStream>\n");
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/ra.c.orig Tue May 12 15:43:56 2009
--- clients/ra.c Tue May 12 15:44:31 2009
***************
*** 112,118 ****
fflush(stdout);
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 112,118 ----
fflush(stdout);
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rabins.c.orig Tue May 12 15:44:50 2009
--- clients/rabins.c Tue May 12 15:45:13 2009
***************
*** 548,554 ****
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 548,554 ----
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/racluster.c.orig Tue May 12 15:45:42 2009
--- clients/racluster.c Tue May 12 15:46:02 2009
***************
*** 233,239 ****
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 233,239 ----
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/racount.c.orig Tue May 12 15:46:23 2009
--- clients/racount.c Tue May 12 15:46:43 2009
***************
*** 254,260 ****
fflush (stdout);
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 254,260 ----
fflush (stdout);
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rahisto.c.orig Tue May 12 15:47:07 2009
--- clients/rahisto.c Tue May 12 15:47:27 2009
***************
*** 403,409 ****
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 403,409 ----
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/ranonymize.c.orig Tue May 12 15:47:54 2009
--- clients/ranonymize.c Tue May 12 15:48:39 2009
***************
*** 504,510 ****
if (sig >= 0) {
if (!(ArgusParser->RaParseCompleting++)) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 504,510 ----
if (sig >= 0) {
if (!(ArgusParser->RaParseCompleting++)) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rapath.c.orig Tue May 12 15:49:00 2009
--- clients/rapath.c Tue May 12 15:49:18 2009
***************
*** 389,395 ****
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 389,395 ----
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rapolicy.c.orig Tue May 12 15:49:45 2009
--- clients/rapolicy.c Tue May 12 15:50:08 2009
***************
*** 87,93 ****
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 87,93 ----
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rasort.c.orig Tue May 12 15:50:23 2009
--- clients/rasort.c Tue May 12 15:50:46 2009
***************
*** 178,184 ****
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 178,184 ----
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rasplit.c.orig Tue May 12 15:51:05 2009
--- clients/rasplit.c Tue May 12 15:51:19 2009
***************
*** 377,383 ****
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 377,383 ----
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rasrvstats.c.orig Tue May 12 15:51:43 2009
--- clients/rasrvstats.c Tue May 12 15:52:20 2009
***************
*** 161,167 ****
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 161,167 ----
}
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rastream.c.orig Tue May 12 15:52:39 2009
--- clients/rastream.c Tue May 12 15:53:07 2009
***************
*** 596,602 ****
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 596,602 ----
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/rastrip.c.orig Tue May 12 15:53:21 2009
--- clients/rastrip.c Tue May 12 15:53:43 2009
***************
*** 158,164 ****
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 158,164 ----
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/ratemplate.c.orig Tue May 12 15:42:43 2009
--- clients/ratemplate.c Tue May 12 15:43:10 2009
***************
*** 78,84 ****
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 78,84 ----
if (sig >= 0) {
if (!ArgusParser->RaParseCompleting++) {
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
*** clients/ratimerange.c.orig Tue May 12 15:41:37 2009
--- clients/ratimerange.c Tue May 12 15:42:18 2009
***************
*** 93,99 ****
fflush (stdout);
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal $d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
--- 93,99 ----
fflush (stdout);
#ifdef ARGUSDEBUG
! ArgusDebug (2, "RaParseComplete(caught signal %d)\n", sig);
#endif
switch (sig) {
case SIGHUP:
More information about the argus
mailing list