Get 5.0.0 branch in sync after rebase with 3.0 main ...

openargus · Mar 11, 2024 · c7bdf2c · c7bdf2c
1 parent aaa0be5
commit c7bdf2c
Show file tree

Hide file tree

Showing 103 changed files with 1,067 additions and 1,377 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,14 +1,14 @@
 #
-#  Argus Software.
-#  Copyright (c) 2000-2020 QoSient, LLC
+#  Argus-5.0 Software.
+#  Copyright (c) 2000-2024 QoSient, LLC
 #  All rights reserved.
 #
 #  $Id: //depot/gargoyle/argus/AUTHORS#5 $
 #  $DateTime: 2015/04/13 00:39:28 $
 #  $Change: 2980 $
 
-Argus and its client software are written, maintained and copyrighted
-by Carter Bullard <[email protected]>.
+Argus and their client software are written, maintained and
+copyrighted  by Carter Bullard <[email protected]> and QoSient, LLC.
 
 Many contributions of fixes, bug reports and design have been
 submitted to the argus developers mailing list over Argus's 30 years.

diff --git a/CREDITS b/CREDITS
@@ -1,6 +1,6 @@
 /*
- * Argus Software - README
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software - README
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
 
  * This program is free software, released under the GNU General

diff --git a/INSTALL b/INSTALL
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus flow data generation
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General

diff --git a/MANIFEST b/MANIFEST
diff --git a/Makefile.in b/Makefile.in
@@ -1,6 +1,27 @@
+# 
+#  Argus-5.0 Software. Argus flow data generation.
+#  Copyright (c) 2000-2024 QoSient, LLC
+#  All rights reserved.
+# 
+# This program is free software, released under the GNU General
+# Public License; you can redistribute it and/or modify it under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 3, or any later version.
 #
-# Makefile for Argus
-# Copyright (C) 1996-2020 QoSient, LLC
+# Other licenses are available through QoSient, LLC.
+# Inquire at [email protected].
+#
+# This program is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the * GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# 
+# Makefile for Argus-5.0
+# Copyright (C) 1996-2024 QoSient, LLC
 # All rights reserved
 #
 #### Start of system configuration section. ####

diff --git a/acsite.m4 b/acsite.m4
@@ -1,5 +1,23 @@
 dnl
-dnl Copyright (C) 2000-2020 QoSient, LLC.
+dnl Argus-5.0 Software. Argus flow data generation.
+dnl Copyright (c) 2000-2024 QoSient, LLC
+dnl All rights reserved.
+dnl
+dnl This program is free software, released under the GNU General
+dnl Public License; you can redistribute it and/or modify it under the terms
+dnl of the GNU General Public License as published by the Free Software
+dnl Foundation; either version 3, or any later version.
+dnl
+dnl Other licenses are available through QoSient, LLC.
+dnl Inquire at [email protected].
+dnl
+dnl This program is distributed WITHOUT ANY WARRANTY; without even the
+dnl implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+dnl See the * GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl   The Regents of the University of California.  All rights reserved.
@@ -134,8 +152,8 @@ m4_define([AC_LBL_C_INIT],
           ac_cv_lbl_gcc_vers=0
           AC_MSG_CHECKING(gcc version)
           AC_CACHE_VAL(ac_cv_lbl_gcc_vers,
-          ac_cv_lbl_gcc_vers=`$CC --version 2>&1 | \
-             sed -e '/^ version /!d' \
+          ac_cv_lbl_gcc_vers=`$CC -v 2>&1 | \
+             sed -e '/^gcc version /!d' \
             -e 's/^gcc version //' \
             -e 's/ .*//' -e 's/^[[[^0-9]]]*//' \
             -e 's/\..*//'`)
@@ -281,10 +299,8 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS],
 #      include <sys/types.h>
 #      include <sys/wait.h>
 #      include <stdio.h>
-#      include <stdlib.h>
-#      include <unistd.h>
       unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
-      int main() {
+      main() {
       unsigned int i;
       pid_t pid;
       int status;
@@ -374,7 +390,6 @@ AC_DEFUN([AC_LBL_DEVEL],
              ;;
           esac
        fi
-       AC_CHECK_FUNCS(backtrace)
     fi])
 
 dnl

diff --git a/argus/Argus802.11.c b/argus/Argus802.11.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - Arp Procession
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - 802.11 Wireless processing
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,12 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/Argus802.11.c#4 $
+ * $DateTime: 2015/04/13 00:39:28 $
+ * $Change: 2980 $
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"
 #endif

diff --git a/argus/ArgusApp.c b/argus/ArgusApp.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - Application Level
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - Application Level
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,11 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusApp.c#8 $
+ * $DateTime: 2016/02/23 00:04:12 $
+ * $Change: 3099 $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"

diff --git a/argus/ArgusArp.c b/argus/ArgusArp.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - Arp Procession
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - Arp Processing
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,11 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusArp.c#4 $
+ * $DateTime: 2015/04/13 00:39:28 $
+ * $Change: 2980 $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"
@@ -137,7 +142,7 @@ ArgusCreateArpFlow (struct ArgusModelerStruct *model, struct ether_header *ep)
 {
    struct arphdr *ahdr = (struct arphdr *)model->ArgusThisUpHdr;
    struct ArgusSystemFlow *retn = NULL;
-   unsigned int arp_tpa = 0, arp_spa = 0;
+   unsigned int arp_tpa, arp_spa;
 
    if (STRUCTCAPTURED(model, *ahdr)) {
       retn = model->ArgusThisFlow;
@@ -205,6 +210,11 @@ ArgusCreateArpFlow (struct ArgusModelerStruct *model, struct ether_header *ep)
             retn->hdr.argus_dsrvl8.len  = sizeof(struct ArgusRarpFlow)/4 + 1;
             retn->hdr.argus_dsrvl8.qual = ARGUS_TYPE_RARP;
 
+            bcopy (TPA(ahdr), &arp_tpa, sizeof(arp_tpa));
+
+#ifdef _LITTLE_ENDIAN
+            arp_tpa = ntohl(arp_tpa);
+#endif
             retn->rarp_flow.hrd     = HRD(ahdr);
             retn->rarp_flow.pro     = PRO(ahdr);
             retn->rarp_flow.hln     = HLN(ahdr);

diff --git a/argus/ArgusAuth.c b/argus/ArgusAuth.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - Authentication
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - Authentication
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,12 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusAuth.c#5 $
+ * $DateTime: 2016/09/20 14:50:14 $
+ * $Change: 3197 $
+ */
+
 /*
  * Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
  *

diff --git a/argus/ArgusEsp.c b/argus/ArgusEsp.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - ESP layer processing
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - ESP layer processing
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,11 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusEsp.c#4 $
+ * $DateTime: 2015/04/13 00:39:28 $
+ * $Change: 2980 $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"

diff --git a/argus/ArgusEvents.c b/argus/ArgusEvents.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - Modeler
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - Events processing
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,12 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusEvents.c#10 $
+ * $DateTime: 2016/10/03 10:25:27 $
+ * $Change: 3209 $
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"
 #endif

diff --git a/argus/ArgusEvents.h b/argus/ArgusEvents.h
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - Modeler
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - Events include files
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,12 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusEvents.h#4 $
+ * $DateTime: 2015/04/13 00:39:28 $
+ * $Change: 2980 $
+ */
+
 
 #ifndef ArgusEvents_h
 #define ArgusEvents_h

diff --git a/argus/ArgusFrag.c b/argus/ArgusFrag.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - Fragment processing
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - Fragment processing
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,11 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusFrag.c#4 $
+ * $DateTime: 2015/04/13 00:39:28 $
+ * $Change: 2980 $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"

diff --git a/argus/ArgusIcmp.c b/argus/ArgusIcmp.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - ICMP protocol processing
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software. Argus files - ICMP protocol processing
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,11 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusIcmp.c#5 $
+ * $DateTime: 2016/04/01 14:32:31 $
+ * $Change: 3134 $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"

diff --git a/argus/ArgusIgmp.c b/argus/ArgusIgmp.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - IGMP protocol processing
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software.  Argus files - IGMP protocol processing
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,11 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusIgmp.c#4 $
+ * $DateTime: 2015/04/13 00:39:28 $
+ * $Change: 2980 $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"

diff --git a/argus/ArgusIsis.c b/argus/ArgusIsis.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - Modeler
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software.  Argus files - ISIS flow tracking
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,12 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusIsis.c#4 $
+ * $DateTime: 2015/04/13 00:39:28 $
+ * $Change: 2980 $
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"
 #endif

diff --git a/argus/ArgusLcp.c b/argus/ArgusLcp.c
@@ -1,6 +1,6 @@
 /*
- * Argus Software.  Argus files - main argus processing
- * Copyright (c) 2000-2020 QoSient, LLC
+ * Argus-5.0 Software.  Argus files - Lcp flow processing
+ * Copyright (c) 2000-2024 QoSient, LLC
  * All rights reserved.
  *
  * This program is free software, released under the GNU General
@@ -24,6 +24,11 @@
  *
  */
 
+/* 
+ * $Id: //depot/gargoyle/argus/argus/ArgusLcp.c#4 $
+ * $DateTime: 2015/04/13 00:39:28 $
+ * $Change: 2980 $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "argus_config.h"