Wireshark · Ethereal-dev: [Ethereal-dev] fix for errors and a warning in MSVC build process

["Lars Roland" <Lars.Roland@xxxxxxx>]

Hello,

attached patch includes:

fix for makefiles in /plugins and /plugins/rdm
removal of second entry of col_set_fence() in plugin api
necessary ifdefs for sdp dissector includes
fix for a warning in packet-tcp.c 

Regards,

Lars

Index: ethereal/plugins/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/plugins/Makefile.nmake,v
retrieving revision 1.28
diff -u -r1.28 Makefile.nmake
--- ethereal/plugins/Makefile.nmake	17 Nov 2003 20:57:10 -0000	1.28
+++ ethereal/plugins/Makefile.nmake	18 Nov 2003 17:10:23 -0000
@@ -11,7 +11,7 @@
 
 OBJECTS=plugin_api.obj 
 
-all: $(OBJECTS) acn artnet asn1 docsis giop gryphon lwres megaco mgcp pcli rdm rtnet
+all: $(OBJECTS) acn artnet asn1 docsis enttec giop gryphon lwres megaco mgcp pcli rdm rtnet
 
 Xplugin_api.c: plugin_gen.py plugin_api_list.c
 	@echo **** Plugin api may be out of date, please generate new files:
Index: ethereal/plugins/Xass-list
===================================================================
RCS file: /cvsroot/ethereal/plugins/Xass-list,v
retrieving revision 1.9
diff -u -r1.9 Xass-list
--- ethereal/plugins/Xass-list	18 Nov 2003 08:59:02 -0000	1.9
+++ ethereal/plugins/Xass-list	18 Nov 2003 17:10:24 -0000
@@ -1,4 +1,4 @@
-/* This file is generated by ./plugin_gen.py, do not edit. */
+/* This file is generated by plugin_gen.py, do not edit. */
 
 check_col, col_clear, col_add_fstr, col_append_fstr, col_prepend_fstr,
 col_add_str, col_append_str, col_set_str, register_init_routine,
@@ -72,4 +72,4 @@
 dissector_reset_string, dissector_try_string, dissector_get_string_handle,
 get_datafile_path, get_tempfile_path, register_heur_dissector_list,
 dissector_try_heuristic, asn1_id_decode1, col_get_writable, col_set_writable,
-col_set_fence, 
+
Index: ethereal/plugins/Xplugin_api.c
===================================================================
RCS file: /cvsroot/ethereal/plugins/Xplugin_api.c,v
retrieving revision 1.13
diff -u -r1.13 Xplugin_api.c
--- ethereal/plugins/Xplugin_api.c	18 Nov 2003 08:59:02 -0000	1.13
+++ ethereal/plugins/Xplugin_api.c	18 Nov 2003 17:10:24 -0000
@@ -1,4 +1,4 @@
-/* This file is generated by ./plugin_gen.py, do not edit. */
+/* This file is generated by plugin_gen.py, do not edit. */
 
 p_check_col = pat->p_check_col;
 p_col_clear = pat->p_col_clear;
@@ -246,4 +246,3 @@
 p_asn1_id_decode1 = pat->p_asn1_id_decode1;
 p_col_get_writable = pat->p_col_get_writable;
 p_col_set_writable = pat->p_col_set_writable;
-p_col_set_fence = pat->p_col_set_fence;
Index: ethereal/plugins/Xplugin_api.h
===================================================================
RCS file: /cvsroot/ethereal/plugins/Xplugin_api.h,v
retrieving revision 1.13
diff -u -r1.13 Xplugin_api.h
--- ethereal/plugins/Xplugin_api.h	18 Nov 2003 08:59:03 -0000	1.13
+++ ethereal/plugins/Xplugin_api.h	18 Nov 2003 17:10:24 -0000
@@ -1,4 +1,4 @@
-/* This file is generated by ./plugin_gen.py, do not edit. */
+/* This file is generated by plugin_gen.py, do not edit. */
 
 #define check_col (*p_check_col)
 #define col_clear (*p_col_clear)
@@ -246,4 +246,3 @@
 #define asn1_id_decode1 (*p_asn1_id_decode1)
 #define col_get_writable (*p_col_get_writable)
 #define col_set_writable (*p_col_set_writable)
-#define col_set_fence (*p_col_set_fence)
Index: ethereal/plugins/Xplugin_api_decls.h
===================================================================
RCS file: /cvsroot/ethereal/plugins/Xplugin_api_decls.h,v
retrieving revision 1.13
diff -u -r1.13 Xplugin_api_decls.h
--- ethereal/plugins/Xplugin_api_decls.h	18 Nov 2003 08:59:03 -0000	1.13
+++ ethereal/plugins/Xplugin_api_decls.h	18 Nov 2003 17:10:24 -0000
@@ -1,4 +1,4 @@
-/* This file is generated by ./plugin_gen.py, do not edit. */
+/* This file is generated by plugin_gen.py, do not edit. */
 
 addr_check_col p_check_col;
 addr_col_clear p_col_clear;
@@ -246,4 +246,3 @@
 addr_asn1_id_decode1 p_asn1_id_decode1;
 addr_col_get_writable p_col_get_writable;
 addr_col_set_writable p_col_set_writable;
-addr_col_set_fence p_col_set_fence;
Index: ethereal/plugins/Xplugin_table.h
===================================================================
RCS file: /cvsroot/ethereal/plugins/Xplugin_table.h,v
retrieving revision 1.14
diff -u -r1.14 Xplugin_table.h
--- ethereal/plugins/Xplugin_table.h	18 Nov 2003 08:59:03 -0000	1.14
+++ ethereal/plugins/Xplugin_table.h	18 Nov 2003 17:10:24 -0000
@@ -1,4 +1,4 @@
-/* This file is generated by ./plugin_gen.py, do not edit. */
+/* This file is generated by plugin_gen.py, do not edit. */
 
 typedef gint (*addr_check_col) (column_info *, gint);
 typedef void (*addr_col_clear) (column_info *, gint);
@@ -246,4 +246,3 @@
 typedef int (*addr_asn1_id_decode1) (ASN1_SCK *, guint *);
 typedef gboolean (*addr_col_get_writable) (column_info *);
 typedef void (*addr_col_set_writable) (column_info *, gboolean);
-typedef void (*addr_col_set_fence) (column_info *, gint);
Index: ethereal/plugins/plugin_api_list.c
===================================================================
RCS file: /cvsroot/ethereal/plugins/plugin_api_list.c,v
retrieving revision 1.16
diff -u -r1.16 plugin_api_list.c
--- ethereal/plugins/plugin_api_list.c	18 Nov 2003 08:55:14 -0000	1.16
+++ ethereal/plugins/plugin_api_list.c	18 Nov 2003 17:10:25 -0000
@@ -390,4 +390,3 @@
 
 gboolean col_get_writable(column_info *);
 void col_set_writable(column_info *, gboolean);
-void col_set_fence(column_info *, gint);
Index: ethereal/plugins/rdm/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/plugins/rdm/Makefile.nmake,v
retrieving revision 1.1
diff -u -r1.1 Makefile.nmake
--- ethereal/plugins/rdm/Makefile.nmake	17 Nov 2003 20:57:14 -0000	1.1
+++ ethereal/plugins/rdm/Makefile.nmake	18 Nov 2003 17:10:25 -0000
@@ -9,13 +9,13 @@
 CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
-OBJECTS=packet-rtnet.obj 
+OBJECTS=packet-rdm.obj 
 
-rtnet.dll rtnet.exp rtnet.lib : $(OBJECTS) ..\plugin_api.obj
-	link -dll /out:rtnet.dll $(OBJECTS) ..\plugin_api.obj \
+rdm.dll rdm.exp rdm.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:rdm.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rdm.dll rdm.exp rdm.lib $(PDB_FILE)
 
 distclean: clean
Index: ethereal/packet-sdp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-sdp.c,v
retrieving revision 1.36
diff -u -r1.36 packet-sdp.c
--- ethereal/packet-sdp.c	17 Nov 2003 21:52:35 -0000	1.36
+++ ethereal/packet-sdp.c	18 Nov 2003 17:10:22 -0000
@@ -31,9 +31,15 @@
 #include <ctype.h>
 
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
 
 #include <glib.h>
 #include <epan/packet.h>
Index: ethereal/packet-tcp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-tcp.c,v
retrieving revision 1.217
diff -u -r1.217 packet-tcp.c
--- ethereal/packet-tcp.c	13 Nov 2003 20:53:44 -0000	1.217
+++ ethereal/packet-tcp.c	18 Nov 2003 17:10:23 -0000
@@ -517,7 +517,7 @@
 }
 
 static void
-tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint32 seglen, guint8 flags, guint16 window)
+tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint32 seglen, guint8 flags, guint32 window)
 {
 	struct tcp_analysis *tcpd=NULL;
 	int direction;