Copy over revisions from the trunk:wireshark-1.0.1

------------------------------------------------------------------------
r25631 | tuexen | 2008-06-29 03:15:41 -0700 (Sun, 29 Jun 2008) | 5 lines
Changed paths:
   M /trunk/epan/dissectors/packet-iua.c

* Fix a bug reported by Peter Hertting: Handle more than one integer interface identifier. 
* Call parameters parameter.
* List integer interface ranges in range parameters.

------------------------------------------------------------------------
r25635 | jake | 2008-06-29 23:35:22 -0700 (Sun, 29 Jun 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-sip.c

Fix for bug 2659:
Account for IPv6 addresses representation in Via header.
------------------------------------------------------------------------

Copy over r25638 by hand:

------------------------------------------------------------------------
r25638 | gerald | 2008-06-30 09:36:37 -0700 (Mon, 30 Jun 2008) | 4 lines
Changed paths:
   M /trunk/gtk/main.c

When we open a debug console on Windows, don't grab stdin. We never read
anything on this particular console, and if we open stdin here we can't
read a capture from an anonymous pipe.

------------------------------------------------------------------------

Update the release notes. Update ChangeLog and NEWS.

Build 1.0.1.

svn path=/trunk-1.0/; revision=25639

7 files changed, 289 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c777bd12a..711376c849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1000,3 +1000,234 @@ Changed paths:
 Update the GNUTLS and libsmi versions.
 
 ------------------------------------------------------------------------
+r25567 | gerald | 2008-06-23 16:18:41 -0700 (Mon, 23 Jun 2008) | 7 lines
+Changed paths:
+   M /trunk-1.0/Makefile.nmake
+   M /trunk-1.0/capture-wpcap.c
+   M /trunk-1.0/config.h.win32
+   M /trunk-1.0/config.nmake
+   M /trunk-1.0/epan/dissectors/packet-ppi.c
+
+From Dustin Johnson: Add support for TurboCap.
+  - packet-ppi.c: Add aggregation and 802.3 extended information.
+  - capture-wpcap.c: Add support for pcap_list_datalinks and pcap_set_datalink.
+
+(Normally I'd check this into /trunk and copy it over to /trunk-1.0, but
+/trunk is a rapidly moving target right now.)
+
+------------------------------------------------------------------------
+r25568 | gerald | 2008-06-23 16:19:24 -0700 (Mon, 23 Jun 2008) | 2 lines
+Changed paths:
+   M /trunk-1.0/ChangeLog
+   M /trunk-1.0/NEWS
+   M /trunk-1.0/version.conf
+
+Build 1.0.1pre1.
+
+------------------------------------------------------------------------
+r25569 | gerald | 2008-06-23 16:42:42 -0700 (Mon, 23 Jun 2008) | 2 lines
+Changed paths:
+   M /trunk-1.0/docbook/release-notes.xml
+
+Fix a typo.
+
+------------------------------------------------------------------------
+r25583 | jake | 2008-06-24 11:24:01 -0700 (Tue, 24 Jun 2008) | 2 lines
+Changed paths:
+   M /trunk-1.0/debian/changelog
+
+Update Debian changelog to correct maintenance release number.
+
+------------------------------------------------------------------------
+r25591 | gerald | 2008-06-24 13:44:47 -0700 (Tue, 24 Jun 2008) | 40 lines
+Changed paths:
+   M /trunk-1.0/Makefile.am
+   M /trunk-1.0/capture-wpcap.c
+   M /trunk-1.0/docbook/release-notes.xml
+   M /trunk-1.0/epan/Makefile.am
+   M /trunk-1.0/epan/dissectors/packet-rmi.c
+   M /trunk-1.0/file.c
+   M /trunk-1.0/make-version.pl
+
+Another try for 1.0.1pre1.
+
+Copy over revisions from the trunk:
+
+------------------------------------------------------------------------
+r24683 | stig | 2008-03-17 17:48:24 -0700 (Mon, 17 Mar 2008) | 2 lines
+Changed paths:
+   M /trunk/file.c
+
+Allow custom columns in export as CSV and PSML.
+
+------------------------------------------------------------------------
+r25579 | morriss | 2008-06-24 10:57:44 -0700 (Tue, 24 Jun 2008) | 1 line
+Changed paths:
+   M /trunk/Makefile.am
+   M /trunk/epan/Makefile.am
+
+Fix *NIX builds where we need our own inet_pton.c or inet_ntop.c .  This should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2607
+------------------------------------------------------------------------
+r25584 | gerald | 2008-06-24 12:08:54 -0700 (Tue, 24 Jun 2008) | 5 lines
+Changed paths:
+   M /trunk/epan/dissectors/packet-rmi.c
+
+Noam Rathus discovered that the RMI dissector was using g_strlcpy
+incorrectly, which could lead to information disclosure or worse. Use
+tvb_format_text instead. This lets us get rid of a character array and
+avoids feeding raw packet data to the GUI.
+
+------------------------------------------------------------------------
+r25586 | gerald | 2008-06-24 12:18:21 -0700 (Tue, 24 Jun 2008) | 2 lines
+Changed paths:
+   M /trunk/epan/dissectors/packet-rmi.c
+
+Highlight the whole hostname, even if we've truncated it in the display.
+
+------------------------------------------------------------------------
+
+Fix a logic error in make-version.pl. Make pcap_list_datalinks and
+pcap_set_datalink mandatory on Windows. Update the release notes.
+
+------------------------------------------------------------------------
+r25595 | gerald | 2008-06-24 17:27:56 -0700 (Tue, 24 Jun 2008) | 10 lines
+Changed paths:
+   M /trunk-1.0/epan/Makefile.am
+
+Copy over revisions from the trunk:
+
+------------------------------------------------------------------------
+r25590 | morriss | 2008-06-24 13:09:43 -0700 (Tue, 24 Jun 2008) | 1 line
+Changed paths:
+   M /trunk/epan/Makefile.am
+
+Make inet_ntop fix work for out-of-tree builds
+------------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r25603 | gerald | 2008-06-25 11:21:15 -0700 (Wed, 25 Jun 2008) | 2 lines
+Changed paths:
+   M /trunk-1.0/version.conf
+
+Stop building -pre1.
+
+------------------------------------------------------------------------
+r25620 | gerald | 2008-06-27 16:12:19 -0700 (Fri, 27 Jun 2008) | 110 lines
+Changed paths:
+   M /trunk-1.0/README
+   M /trunk-1.0/docbook/release-notes.xml
+   M /trunk-1.0/epan/dissectors/packet-eigrp.c
+   M /trunk-1.0/epan/dissectors/packet-erf.c
+   M /trunk-1.0/epan/dissectors/packet-syslog.c
+
+Copy over revisions from the trunk:
+
+------------------------------------------------------------------------
+r24721 | jake | 2008-03-24 03:49:23 -0700 (Mon, 24 Mar 2008) | 4 lines
+Changed paths:
+   M /trunk/epan/dissectors/packet-eigrp.c
+
+FIx for bug 2381:
+The eigrp update packets may contain more than one destination advertisement
+per one "IP external route" or "IP internal route" TLV. Recurse over prefix/network
+address pairs until TLV is exhausted.
+------------------------------------------------------------------------
+r25598 | jake | 2008-06-24 23:18:23 -0700 (Tue, 24 Jun 2008) | 2 lines
+Changed paths:
+   M /trunk/epan/dissectors/packet-eigrp.c
+
+From Max Ivanov:
+The destination unreachable indication for external IP routes is at offset 24, not 4 as in internal IP routes.
+------------------------------------------------------------------------
+r25604 | jake | 2008-06-25 14:21:33 -0700 (Wed, 25 Jun 2008) | 1 line
+Changed paths:
+   M /trunk/README
+
+Update the document to the current state of affairs.
+------------------------------------------------------------------------
+r25605 | guy | 2008-06-25 15:52:08 -0700 (Wed, 25 Jun 2008) | 17 lines
+Changed paths:
+   M /trunk/README
+
+We apper to spell it "TShark" rather than "Tshark", the fact that it's
+"Wireshark" rather than "WireShark" nonwithstanding.
+
+Say we run on NT 4.0 rather than "NT" - I don't know whether we run on
+NT 3.x (and 2000/2003/XP are really NT 5.x and Vista/2008 are really NT
+6.x - that's why Microsoft are talking about "Windows 7" as the next big
+release).
+
+In the capture-privileges paragraph, note that it's dumpcap that needs
+to run as root, and suggest not only that Wireshark shouldn't be set-UID
+root, but that it shouldn't even be run as root, and that the same
+applies to TShark.
+
+Update "How to Report a Bug" to reflect that we're telling people to
+report bugs on Bugzilla, and that "wireshark -v"/"tshark -v" give almost
+all the version information we want.
+
+------------------------------------------------------------------------
+r25606 | gerald | 2008-06-25 16:07:40 -0700 (Wed, 25 Jun 2008) | 4 lines
+Changed paths:
+   M /trunk/README
+
+We last supported NT 4.0 with version 0.99.4 (according to
+wireshark.nsi, at least). Drop it from the "supported" list and add a
+note about NT 4.0 and older Windows versions.
+
+------------------------------------------------------------------------
+r25273 | wmeier | 2008-05-11 10:18:59 -0700 (Sun, 11 May 2008) | 2 lines
+Changed paths:
+   M /trunk/epan/dissectors/packet-erf.c
+
+Convert C++ style comments ...
+
+------------------------------------------------------------------------
+r25608 | guy | 2008-06-25 18:38:38 -0700 (Wed, 25 Jun 2008) | 19 lines
+Changed paths:
+   M /trunk/epan/dissectors/packet-erf.c
+
+Make the preference settings for the dissector to use for various ERF
+link-layer types static.
+
+If the preference is set to "raw data" for any of those types, display
+the raw data with an indication that the preference in question has been
+set to "raw data", so people don't just wonder why ERF files aren't
+working right any more.  (See bug 2641; I had the same surprise when I
+tried it on some ERF captures I have.)
+
+Pull the dissect_erf_header() code into dissect_erf() - it's dissecting
+the *payload*, not the *header*.
+
+Fill in the Info column with the record type.
+
+When using tvb_new_subset() to chop a header off of a tvbuff, just
+specify lengths of -1, so we go all the way to the end.
+
+Clean up the Infiniband dissector call.
+
+------------------------------------------------------------------------
+r25609 | guy | 2008-06-25 18:47:59 -0700 (Wed, 25 Jun 2008) | 3 lines
+Changed paths:
+   M /trunk/epan/dissectors/packet-erf.c
+
+Make the default for HDLC traffic "Raw data", just as it is for other
+record types, so that people know they have to set the preference.
+
+------------------------------------------------------------------------
+r25612 | morriss | 2008-06-26 13:40:30 -0700 (Thu, 26 Jun 2008) | 7 lines
+Changed paths:
+   M /trunk/epan/dissectors/packet-syslog.c
+
+From Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2647 :
+The syslog dissector could crash if the "packlog" MSU is truncated such that
+the hex string ends in with a nibble.
+
+From me: Check if that will happen and chop off the nibble before giving it to
+convert_string_to_hex() so we'll dissect as much of the MSU as possible.
+
+------------------------------------------------------------------------
+
+Update the release notes.
+
+------------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index 77d86a8674..9ffba0e738 100644
--- a/NEWS
+++ b/NEWS
@@ -24,10 +24,19 @@ What's New
 
        Versions affected: 0.99.3 to 1.0.0
 
-     o The RTMTP dissector could crash.
+     o The RTMPT dissector could crash.
 
        Versions affected: 0.99.8 to 1.0.0
 
+     o The RMI dissector could disclose system memory. Discovered by
+       Noam Rathus.
+
+       Versions affected: 0.9.5 to 1.0.0
+
+     o The syslog dissector could crash.
+
+       Versions affected: 1.0.0
+
    The following bugs have been fixed:
 
      o RPC portmap classification switched to TCP after filtering.
@@ -44,6 +53,8 @@ What's New
 
      o Window scaling bug. (Bug 2378)
 
+     o Bugs in the EIGRP dissector. (Bug 2381)
+
      o E212 Mobile network code 3rd digit is not correctly decoded.
        (Bug 2393)
 
@@ -122,8 +133,8 @@ What's New
 
   Updated Protocol Support
 
-   ACTRACE, BACnet BVLC, BOOTP, E212, iSCSI, LDAP, MGCP, MIKEY,
-   MSMMS, RPC, RTCP, RTP, SNMP, TCP, UNIStim, WiMAX
+   ACTRACE, BACnet BVLC, BOOTP, E212, iSCSI, IUA, LDAP, MGCP, MIKEY,
+   MSMMS, RMI, RPC, RTCP, RTP, SIP, SNMP, TCP, UNIStim, WiMAX
 
   New and Updated Capture File Support
 
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index 76db19b6f9..8a63f46433 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -354,6 +354,7 @@ BACnet BVLC,
 BOOTP,
 E212,
 iSCSI,
+IUA,
 LDAP,
 MGCP,
 MIKEY,
@@ -362,6 +363,7 @@ RMI,
 RPC,
 RTCP,
 RTP,
+SIP,
 SNMP,
 TCP,
 UNIStim,
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index 874f5de051..5dfdd0e532 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -98,14 +98,24 @@ static dissector_handle_t q931_handle;
 #define PARAMETER_VALUE_OFFSET  (PARAMETER_LENGTH_OFFSET + PARAMETER_LENGTH_LENGTH)
 #define PARAMETER_HEADER_OFFSET PARAMETER_TAG_OFFSET
 
-#define INT_INTERFACE_ID_OFFSET PARAMETER_VALUE_OFFSET
 #define INT_INTERFACE_ID_LENGTH 4
 
 static void
 dissect_int_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  proto_tree_add_item(parameter_tree, hf_int_interface_id, parameter_tvb, INT_INTERFACE_ID_OFFSET, INT_INTERFACE_ID_LENGTH, NETWORK_BYTE_ORDER);
-  proto_item_append_text(parameter_item, " (%d)", tvb_get_ntohl(parameter_tvb, INT_INTERFACE_ID_OFFSET));
+  guint16 number_of_ids, id_number;
+  gint offset;
+
+  number_of_ids= (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) / INT_INTERFACE_ID_LENGTH;
+  offset = PARAMETER_VALUE_OFFSET;
+
+  proto_item_append_text(parameter_item, " ("); 
+  for (id_number = 1; id_number <= number_of_ids; id_number++) {
+    proto_tree_add_item(parameter_tree, hf_int_interface_id, parameter_tvb, offset, INT_INTERFACE_ID_LENGTH, NETWORK_BYTE_ORDER);
+    proto_item_append_text(parameter_item, (id_number > 1) ? ", %d" : "%d", tvb_get_ntohl(parameter_tvb, offset));
+    offset += INT_INTERFACE_ID_LENGTH;
+  }
+  proto_item_append_text(parameter_item, ")"); 
 }
 
 #define TEXT_INTERFACE_ID_OFFSET PARAMETER_VALUE_OFFSET
@@ -185,13 +195,15 @@ dissect_integer_range_interface_identifier_parameter(tvbuff_t *parameter_tvb, pr
 
   number_of_ranges = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) / INTERVAL_LENGTH;
   offset = PARAMETER_VALUE_OFFSET;
-  for(range_number = 1; range_number <= number_of_ranges; range_number++) {
+  proto_item_append_text(parameter_item, " ("); 
+  for (range_number = 1; range_number <= number_of_ranges; range_number++) {
     proto_tree_add_item(parameter_tree, hf_interface_range_start, parameter_tvb, offset + START_OFFSET, START_LENGTH, NETWORK_BYTE_ORDER);
     proto_tree_add_item(parameter_tree, hf_interface_range_end,   parameter_tvb, offset + END_OFFSET,   END_LENGTH,   NETWORK_BYTE_ORDER);
+    proto_item_append_text(parameter_item, (range_number > 1) ? ", %d-%d" : "%d-%d",
+                           tvb_get_ntohl(parameter_tvb, offset + START_OFFSET), tvb_get_ntohl(parameter_tvb, offset + END_OFFSET));
     offset += INTERVAL_LENGTH;
-  };
-
-  proto_item_append_text(parameter_item, " (%u range%s)", number_of_ranges, plurality(number_of_ranges, "", "s"));
+  }
+  proto_item_append_text(parameter_item, ")");
 }
 
 #define HEARTBEAT_DATA_OFFSET PARAMETER_VALUE_OFFSET
@@ -499,7 +511,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree,
 
   /* create proto_tree stuff */
   parameter_item   = proto_tree_add_text(iua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb),
-                                         val_to_str(tag, support_IG?parameter_tag_ig_values:parameter_tag_values, "Unknown parameter"));
+                                         "%s parameter", val_to_str(tag, support_IG?parameter_tag_ig_values:parameter_tag_values, "Unknown"));
   parameter_tree   = proto_item_add_subtree(parameter_item, ett_iua_parameter);
 
   /* add tag and length to the iua tree */
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 7e67599506..7e9682a074 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -1199,6 +1199,8 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o
 	guint transport_slash_count = 0;
 	gboolean transport_name_started = FALSE;
 	gboolean colon_seen = FALSE;
+	gboolean ipv6_reference = FALSE;
+	gboolean ipv6_address = FALSE;
 	guchar c;
 	gchar *param_name = NULL;
 
@@ -1249,7 +1251,16 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o
 	{
 		c = tvb_get_guint8(tvb, current_offset);
 
-		if (colon_seen || (c == ' ') || (c == '\t') || (c == ':') || (c == ';'))
+		if (c == '[') {
+			ipv6_reference = TRUE;
+			ipv6_address = TRUE;
+		}
+		else if (c == ']')
+		{
+			ipv6_reference = FALSE;
+		}
+
+		if (colon_seen || (c == ' ') || (c == '\t') || ((c == ':') && (ipv6_reference == FALSE)) || (c == ';'))
 		{
 			break;
 		}
@@ -1257,8 +1268,13 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o
 		current_offset++;
 	}
 	/* Add address to tree */
-	proto_tree_add_item(tree, hf_sip_via_sent_by_address, tvb, address_start_offset,
-	                    current_offset - address_start_offset, FALSE);
+	if (ipv6_address == TRUE) {
+		proto_tree_add_item(tree, hf_sip_via_sent_by_address, tvb, address_start_offset + 1,
+		                    current_offset - address_start_offset - 2, FALSE);
+	} else {
+		proto_tree_add_item(tree, hf_sip_via_sent_by_address, tvb, address_start_offset,
+		                    current_offset - address_start_offset, FALSE);
+	}
 
 	/* Transport port number may follow ([space] : [space])*/
 	current_offset = tvb_skip_wsp(tvb, current_offset, line_end_offset - current_offset);
diff --git a/gtk/main.c b/gtk/main.c
index c0879c8b2f..f5ddfa0855 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -3277,7 +3277,7 @@ create_console(void)
        create one and make it the standard input, output, and error. */
     if (!AllocConsole())
       return;   /* couldn't create console */
-    eth_freopen("CONIN$", "r", stdin);
+
     eth_freopen("CONOUT$", "w", stdout);
     eth_freopen("CONOUT$", "w", stderr);
 
diff --git a/version.conf b/version.conf
index c2f9963519..efa95b52b3 100644
--- a/version.conf
+++ b/version.conf
@@ -1,4 +1,4 @@
 # Everything should be disabled for the final.
 enable: 1
-pkg_format: pre2-%#
-pkg_enable: 1
+pkg_format: 
+pkg_enable: 0