Project

General

Profile

Files » barnyard.64bit.diff

Patch for Barnyard 0.2.0 to work correctly on 64Bit systems. - Victor Julien, 04/18/2010 03:30 PM

View differences:

barnyard-0.2.0.64bit/src/barnyard.h 2007-08-11 23:22:53.000000000 -0400
34 34

  
35 35
typedef struct _SnortPktHeader
36 36
{
37
    struct timeval ts;     /* packet timestamp */
37
    // struct timeval ts;     /* packet timestamp */
38
    struct pcap_timeval ts;     /* packet timestamp */
38 39
    u_int32_t caplen;      /* packet capture length */
39 40
    u_int32_t pktlen;      /* packet "real" length */
40 41
} SnortPktHeader;
barnyard-0.2.0.64bit/src/event.h 2007-08-12 00:13:44.000000000 -0400
19 19
#include <sys/types.h>
20 20
#include <sys/time.h>
21 21

  
22
struct pcap_timeval {
23
    u_int32_t tv_sec;      /* seconds */
24
    u_int32_t tv_usec;     /* microseconds */
25
};
26

  
22 27
typedef struct _Event
23 28
{
24 29
    u_int32_t sig_generator;   /* which part of snort generated the alert? */
......
30 35
    u_int32_t event_reference; /* reference to other events that have gone off,
31 36
                                * such as in the case of tagged packets...
32 37
                                */
33
    struct timeval ref_time;   /* reference time for the event reference */
38
    // struct timeval ref_time;   /* reference time for the event reference */
39
    struct pcap_timeval ref_time;   /* reference time for the event reference */
34 40
} Event;
35 41
#endif /* __EVENT_H__ */
barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h 2007-08-11 23:24:25.000000000 -0400
34 34
typedef struct _UnifiedAlertRecord
35 35
{
36 36
    Event event;
37
    struct timeval ts;         /* event timestamp */
37
    // struct timeval ts;         /* event timestamp */
38
    struct pcap_timeval ts;         /* event timestamp */
38 39
    u_int32_t sip;             /* src ip */
39 40
    u_int32_t dip;             /* dest ip */
40 41
    u_int16_t sp;              /* src port */
barnyard-0.2.0.64bit/src/util.c 2007-08-12 00:14:52.000000000 -0400
514 514

  
515 515
static char tmpbuf[256];
516 516

  
517
int RenderTimeval(struct timeval *tv, char *timebuf, size_t len)
517
// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len)
518
int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len)
518 519
{
519 520
    struct tm *lt;
520 521
    time_t timet;
barnyard-0.2.0.64bit/src/util.h 2007-08-11 23:23:46.000000000 -0400
39 39
void ClearDumpBuf();
40 40
void GoDaemon();
41 41
size_t RenderTimestamp(time_t timet, char *timebuf, size_t len);
42
int RenderTimeval(struct timeval *tv, char *timebuf, size_t len);
42
// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len);
43
int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len);
43 44
int CreatePidFile(char *filename);
44 45
int String2Long(char *string, long *result);
45 46
int String2ULong(char *string, unsigned long *result);
(7-7/80)