barnyard/barnyard.64bit.diff

   1 diff -ur barnyard-0.2.0/src/barnyard.h barnyard-0.2.0.64bit/src/barnyard.h
   2 --- barnyard-0.2.0/src/barnyard.h       2004-05-01 12:43:29.000000000 -0400
   3 +++ barnyard-0.2.0.64bit/src/barnyard.h 2007-08-11 23:22:53.000000000 -0400
   4 @@ -34,7 +34,8 @@
   5
   6  typedef struct _SnortPktHeader
   7  {
   8 -    struct timeval ts;     /* packet timestamp */
   9 +    // struct timeval ts;     /* packet timestamp */
  10 +    struct pcap_timeval ts;     /* packet timestamp */
  11      u_int32_t caplen;      /* packet capture length */
  12      u_int32_t pktlen;      /* packet "real" length */
  13  } SnortPktHeader;
  14 Only in barnyard-0.2.0.64bit/src: barnyard.h~
  15 diff -ur barnyard-0.2.0/src/event.h barnyard-0.2.0.64bit/src/event.h
  16 --- barnyard-0.2.0/src/event.h  2003-05-02 22:44:12.000000000 -0400
  17 +++ barnyard-0.2.0.64bit/src/event.h    2007-08-12 00:13:44.000000000 -0400
  18 @@ -19,6 +19,11 @@
  19  #include <sys/types.h>
  20  #include <sys/time.h>
  21
  22 +struct pcap_timeval {
  23 +    u_int32_t tv_sec;      /* seconds */
  24 +    u_int32_t tv_usec;     /* microseconds */
  25 +};
  26 +
  27  typedef struct _Event
  28  {
  29      u_int32_t sig_generator;   /* which part of snort generated the alert? */
  30 @@ -30,6 +35,7 @@
  31      u_int32_t event_reference; /* reference to other events that have gone off,
  32                                  * such as in the case of tagged packets...
  33                                  */
  34 -    struct timeval ref_time;   /* reference time for the event reference */
  35 +    // struct timeval ref_time;   /* reference time for the event reference */
  36 +    struct pcap_timeval ref_time;   /* reference time for the event reference */
  37  } Event;
  38  #endif /* __EVENT_H__ */
  39 Only in barnyard-0.2.0.64bit/src: event.h~
  40 diff -ur barnyard-0.2.0/src/input-plugins/dp_alert.h barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h
  41 --- barnyard-0.2.0/src/input-plugins/dp_alert.h 2004-02-19 20:59:48.000000000 -0500
  42 +++ barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h   2007-08-11 23:24:25.000000000 -0400
  43 @@ -34,7 +34,8 @@
  44  typedef struct _UnifiedAlertRecord
  45  {
  46      Event event;
  47 -    struct timeval ts;         /* event timestamp */
  48 +    // struct timeval ts;         /* event timestamp */
  49 +    struct pcap_timeval ts;         /* event timestamp */
  50      u_int32_t sip;             /* src ip */
  51      u_int32_t dip;             /* dest ip */
  52      u_int16_t sp;              /* src port */
  53 Only in barnyard-0.2.0.64bit/src/input-plugins: dp_alert.h~
  54 diff -ur barnyard-0.2.0/src/util.c barnyard-0.2.0.64bit/src/util.c
  55 --- barnyard-0.2.0/src/util.c   2004-03-06 17:30:15.000000000 -0500
  56 +++ barnyard-0.2.0.64bit/src/util.c     2007-08-12 00:14:52.000000000 -0400
  57 @@ -514,7 +514,8 @@
  58
  59  static char tmpbuf[256];
  60
  61 -int RenderTimeval(struct timeval *tv, char *timebuf, size_t len)
  62 +// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len)
  63 +int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len)
  64  {
  65      struct tm *lt;
  66      time_t timet;
  67 Only in barnyard-0.2.0.64bit/src: util.c~
  68 diff -ur barnyard-0.2.0/src/util.h barnyard-0.2.0.64bit/src/util.h
  69 --- barnyard-0.2.0/src/util.h   2004-03-06 19:23:50.000000000 -0500
  70 +++ barnyard-0.2.0.64bit/src/util.h     2007-08-11 23:23:46.000000000 -0400
  71 @@ -39,7 +39,8 @@
  72  void ClearDumpBuf();
  73  void GoDaemon();
  74  size_t RenderTimestamp(time_t timet, char *timebuf, size_t len);
  75 -int RenderTimeval(struct timeval *tv, char *timebuf, size_t len);
  76 +// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len);
  77 +int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len);
  78  int CreatePidFile(char *filename);
  79  int String2Long(char *string, long *result);
  80  int String2ULong(char *string, unsigned long *result);
  81 Only in barnyard-0.2.0.64bit/src: util.h~