""

rbu · Jun 10, 2002 · 8c2f891 · 8c2f891
1 parent 4b9ac93
commit 8c2f891
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 36 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,5 @@
 Changelog for driftnet
-$Id: CHANGES,v 1.11 2002/06/01 15:26:09 chris Exp $
+$Id: CHANGES,v 1.12 2002/06/10 21:25:48 chris Exp $
 
 0.1.5
 

diff --git a/CREDITS b/CREDITS
@@ -1,5 +1,5 @@
 Credits and contributors for driftnet
-$Id: CREDITS,v 1.5 2002/06/01 15:26:09 chris Exp $
+$Id: CREDITS,v 1.6 2002/06/10 21:25:48 chris Exp $
 
 Thanks to the authors of EtherPEG, for a cool idea, and to Eric Richardson,
 whose website brought it to my attention.
@@ -10,5 +10,5 @@ Others certainly remain.
 Jamie Zawinski for helpful suggestions and webcollage integration.
 
 Eric Dobbs for fixing some portability issues and getting driftnet running on
-Solaris.
+Solaris and BSD systems.
 
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@
 # Copyright (c) 2001 Chris Lightfoot. All rights reserved.
 # Email: chris@ex-parrot.com; WWW: http://www.ex-parrot.com/~chris/
 #
-# $Id: Makefile,v 1.29 2002/06/05 11:34:49 chris Exp $
+# $Id: Makefile,v 1.30 2002/06/10 21:25:48 chris Exp $
 #
 
 
@@ -43,13 +43,16 @@ LDLIBS  += -ljpeg -lungif `gtk-config --libs`
 
 # On systems with a C99 compiler, driftnet will use <stdint.h> for the
 # definitions of types such as uint8_t. On other systems like Solaris, these
-# are in <sys/inttypes.h>, and you should uncomment this line.
-#CFLAGS += -DUSE_SYS_INT_TYPES_H
+# are in <sys/types.h>, and you should uncomment this line.
+#CFLAGS += -DUSE_SYS_TYPES_H
 
 # On Solaris, it is necessary to link against -lposix4 for the definition of
 # nanosleep; uncomment the below.
 #LDLIBS  += -lposix4
 
+# added 20020604 edobbs
+# On BSD systems, may need to use /usr/local/include
+#CFLAGS += -I/usr/local/include
 
 #
 # No user-serviceable parts below this point.

diff --git a/README b/README
@@ -1,5 +1,5 @@
 README for driftnet
-$Id: README,v 1.6 2002/05/29 11:52:23 chris Exp $
+$Id: README,v 1.7 2002/06/10 21:25:48 chris Exp $
 
 Driftnet watches network traffic, and picks out and displays JPEG and GIF
 images for display. It is an horrific invasion of privacy and shouldn't be used

diff --git a/audio.c b/audio.c
@@ -11,7 +11,7 @@
  *
  */
 
-static const char rcsid[] = "$Id: audio.c,v 1.2 2002/06/01 12:58:22 chris Exp $";
+static const char rcsid[] = "$Id: audio.c,v 1.3 2002/06/10 21:25:48 chris Exp $";
 
 #include <string.h>
 

diff --git a/connection.c b/connection.c
@@ -6,7 +6,7 @@
  *
  */
 
-static const char rcsid[] = "$Id: connection.c,v 1.1 2002/06/03 22:10:45 chris Exp $";
+static const char rcsid[] = "$Id: connection.c,v 1.2 2002/06/10 21:25:48 chris Exp $";
 
 #include <assert.h>
 #include <stdio.h>

diff --git a/display.c b/display.c
@@ -9,7 +9,7 @@
 
 #ifndef NO_DISPLAY_WINDOW
 
-static const char rcsid[] = "$Id: display.c,v 1.11 2002/06/01 12:58:22 chris Exp $";
+static const char rcsid[] = "$Id: display.c,v 1.12 2002/06/10 21:25:48 chris Exp $";
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>

diff --git a/driftnet.c b/driftnet.c
@@ -7,7 +7,7 @@
  *
  */
 
-static const char rcsid[] = "$Id: driftnet.c,v 1.22 2002/06/04 19:09:02 chris Exp $";
+static const char rcsid[] = "$Id: driftnet.c,v 1.23 2002/06/10 21:25:48 chris Exp $";
 
 #undef NDEBUG
 
@@ -16,6 +16,7 @@ static const char rcsid[] = "$Id: driftnet.c,v 1.22 2002/06/04 19:09:02 chris Ex
 #include <errno.h>
 #include <pcap.h>
 
+#include <netinet/in.h> /* needs to be before <arpa/inet.h> on OpenBSD */
 #include <arpa/inet.h>
 #include <limits.h>
 
@@ -645,6 +646,7 @@ int main(int argc, char *argv[]) {
 #endif /* !NO_DISPLAY_WINDOW */
 
     /* Start up pcap. */
+
     pc = pcap_open_live(interface, SNAPLEN, promisc, 1000, ebuf);
     if (!pc) {
         fprintf(stderr, PROGNAME": pcap_open_live: %s\n", ebuf);

diff --git a/driftnet.h b/driftnet.h
@@ -5,7 +5,7 @@
  * Copyright (c) 2001 Chris Lightfoot. All rights reserved.
  * Email: chris@ex-parrot.com; WWW: http://www.ex-parrot.com/~chris/
  *
- * $Id: driftnet.h,v 1.6 2002/06/03 22:10:02 chris Exp $
+ * $Id: driftnet.h,v 1.7 2002/06/10 21:25:48 chris Exp $
  *
  */
 
@@ -14,6 +14,7 @@
 
 #define PROGNAME    "driftnet"
 
+#include <sys/types.h> /* added 20020604 edobbs for OpenBSD */
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

diff --git a/endian.c b/endian.c
@@ -7,20 +7,22 @@
  *
  */
 
-static const char rcsid[] = "$Id: endian.c,v 1.4 2002/06/05 00:29:43 chris Exp $";
+static const char rcsid[] = "$Id: endian.c,v 1.5 2002/06/10 21:25:48 chris Exp $";
 
 #include <stdio.h>
-#ifdef USE_SYS_INT_TYPES_H
-#   include <sys/int_types.h>   /* Solaris etc. */
+#ifdef USE_SYS_TYPES_H
+#   include <sys/types.h>       /* Solaris etc. */
 #else
 #   include <stdint.h>          /* C99 standard. */
 #endif
 
 int main(void) {
 #if defined(LITTLE_ENDIAN) || defined(_LITTLE_ENDIAN)
     printf("-DDRIFTNET_LITTLE_ENDIAN\n");
+	return 0;
 #elif defined(BIG_ENDIAN) || defined(_BIG_ENDIAN)
     printf("-DDRIFTNET_BIG_ENDIAN\n");
+	return 0;
 #else
     uint32_t a = 0;
     *((uint8_t*)&a) = 0xff;

diff --git a/gif.c b/gif.c
@@ -7,7 +7,7 @@
  *
  */
 
-static const char rcsid[] = "$Id: gif.c,v 1.2 2002/06/01 11:44:17 chris Exp $";
+static const char rcsid[] = "$Id: gif.c,v 1.3 2002/06/10 21:25:48 chris Exp $";
 
 #include <gif_lib.h>
 

diff --git a/image.c b/image.c
@@ -7,7 +7,7 @@
  *
  */
 
-static const char rcsid[] = "$Id: image.c,v 1.7 2002/06/01 17:39:11 chris Exp $";
+static const char rcsid[] = "$Id: image.c,v 1.8 2002/06/10 21:25:48 chris Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/img.c b/img.c
@@ -7,7 +7,7 @@
  *
  */
 
-static const char rcsid[] = "$Id: img.c,v 1.7 2002/06/01 11:44:17 chris Exp $";
+static const char rcsid[] = "$Id: img.c,v 1.8 2002/06/10 21:25:48 chris Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/img.h b/img.h
@@ -5,15 +5,15 @@
  * Copyright (c) 2001 Chris Lightfoot. All rights reserved.
  * Email: chris@ex-parrot.com; WWW: http://www.ex-parrot.com/~chris/
  *
- * $Id: img.h,v 1.5 2002/06/01 15:26:09 chris Exp $
+ * $Id: img.h,v 1.6 2002/06/10 21:25:48 chris Exp $
  *
  */
 
 #ifndef __IMG_H_ /* include guard */
 #define __IMG_H_
 
-#ifdef USE_SYS_INT_TYPES_H
-#   include <sys/int_types.h>   /* Solaris etc. */
+#ifdef USE_SYS_TYPES_H
+#   include <sys/types.h>   /* Solaris etc. */
 #else
 #   include <stdint.h>          /* C99 standard */
 #endif

diff --git a/jpeg.c b/jpeg.c
@@ -7,7 +7,7 @@
  *
  */
 
-static const char rcsid[] = "$Id: jpeg.c,v 1.3 2002/06/01 11:44:17 chris Exp $";
+static const char rcsid[] = "$Id: jpeg.c,v 1.4 2002/06/10 21:25:48 chris Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/media.c b/media.c
@@ -7,7 +7,7 @@
  *
  */
 
-static const char rcsid[] = "$Id: media.c,v 1.1 2002/06/03 22:10:45 chris Exp $";
+static const char rcsid[] = "$Id: media.c,v 1.2 2002/06/10 21:25:48 chris Exp $";
 
 #include <assert.h>
 #include <dirent.h>
@@ -17,6 +17,8 @@ static const char rcsid[] = "$Id: media.c,v 1.1 2002/06/03 22:10:45 chris Exp $"
 #include <string.h>
 #include <unistd.h>
 
+#include <limits.h> /* added 20020603 edobbs for PATH_MAX on Solaris */
+
 #include "driftnet.h"
 
 extern char *tmpdir;    /* in driftnet.c */

diff --git a/mpeghdr.c b/mpeghdr.c
@@ -7,9 +7,8 @@
  *
  */
 
-static const char rcsid[] = "$Id: mpeghdr.c,v 1.3 2002/06/01 12:58:22 chris Exp $";
+static const char rcsid[] = "$Id: mpeghdr.c,v 1.4 2002/06/10 21:25:48 chris Exp $";
 
-#include <stdbool.h>
 #include <stdio.h>
 
 #include "mpeghdr.h"

diff --git a/mpeghdr.h b/mpeghdr.h
@@ -5,19 +5,17 @@
  * Copyright (c) 2002 Chris Lightfoot. All rights reserved.
  * Email: chris@ex-parrot.com; WWW: http://www.ex-parrot.com/~chris/
  *
- * $Id: mpeghdr.h,v 1.2 2002/06/01 11:44:17 chris Exp $
+ * $Id: mpeghdr.h,v 1.3 2002/06/10 21:25:48 chris Exp $
  *
  */
 
 #ifndef __MPEGHDR_H_ /* include guard */
 #define __MPEGHDR_H_
 
-#include <stdbool.h>
-
-#ifdef USE_SYS_INT_TYPES_H
-#include <sys/int_types.h>  /* Solaris etc. */
+#ifdef USE_SYS_TYPES_H
+#	include <sys/types.h>  /* Solaris etc. */
 #else
-#include <stdint.h>         /* C99 standard. */
+#	include <stdint.h>         /* C99 standard. */
 #endif
 
 #include <stdio.h>
@@ -28,21 +26,21 @@ struct mpeg_audio_hdr {
     enum { m_vers_unknown = 0, m_vers_1, m_vers_2, m_vers_2_5 } version;
     enum { m_layer_unknown = 0, m_layer_1, m_layer_2, m_layer_3 } layer;
 
-    bool has_crc;
+    int has_crc;
     uint16_t crc;
 
     int bitrate;
     int samplerate;
 
-    bool padded;
+    int padded;
 
-    bool priv;
+    int priv;
 
     enum { m_chan_stereo = 0, m_chan_joint, m_chan_dual, m_chan_mono} channels;
 
     uint8_t mode_extn;
 
-    bool copyr, original;
+    int copyr, original;
 
     uint8_t emph;
 };

diff --git a/png.c b/png.c
@@ -6,5 +6,5 @@
  *
  */
 
-static const char rcsid[] = "$Id: png.c,v 1.2 2002/06/01 11:44:17 chris Exp $";
+static const char rcsid[] = "$Id: png.c,v 1.3 2002/06/10 21:25:48 chris Exp $";
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
      *
      */
-    static const char rcsid[] = "$Id: audio.c,v 1.2 2002/06/01 12:58:22 chris Exp $";
+    static const char rcsid[] = "$Id: audio.c,v 1.3 2002/06/10 21:25:48 chris Exp $";
     #include <string.h>
@@ Expand Down @@