Remove extra space before "Port" in proto_tree label.

Add packet-socks.obj to Makefile.nmake.

svn path=/trunk/; revision=1845

diff --git a/Makefile.nmake b/Makefile.nmake
index b9b631428239b4d78995c8fd407f192e98815e7d..587a828f219e67fa98380f0ee9ebc43567b86261 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: nmake -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.24 2000/04/12 21:51:27 gram Exp $
+# $Id: Makefile.nmake,v 1.25 2000/04/13 11:11:37 gram Exp $
 
 include config.nmake
 
@@ -107,6 +107,7 @@ DISSECTOR_OBJECTS = \
        packet-smb-pipe.obj \
        packet-sna.obj   \
        packet-snmp.obj \
+       packet-socks.obj \
        packet-srvloc.obj \
        packet-sscop.obj \
        packet-stat.obj   \

diff --git a/packet-socks.c b/packet-socks.c
index 30e9692d6fd3dc77b1a7bf92d112529f9f372d4f..c756a13f3ab8ebe9826d98416524e7845af793f2 100644 (file)
--- a/packet-socks.c
+++ b/packet-socks.c
@@ -2,7 +2,7 @@
  * Routines for socks versions 4 &5  packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-socks.c,v 1.1 2000/04/12 22:53:14 guy Exp $
+ * $Id: packet-socks.c,v 1.2 2000/04/13 11:11:38 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -631,7 +631,7 @@ void display_socks_v5( const u_char *pd, int offset, frame_data *fd,
                CHECK_PACKET_LENGTH( 2);
                                                /* Do remote port       */
                proto_tree_add_text( tree, offset, 2,
-                               "%s Port: %d",
+                               "%sPort: %d",
                                (compare_packet( hash_info->bind_reply_row) ?
                                        "Remote Host " : ""),
                                 pntohs( &pd[ offset]));