|
[-]
[+]
|
Changed |
wireshark.changes
|
|
|
|
[-]
[+]
|
Changed |
wireshark.spec
^
|
|
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/ChangeLog
^
|
| @@ -1,5 +1,5 @@
------------------------------------------------------------------------
-r43435 | gerald | 2012-06-21 12:34:13 -0700 (Thu, 21 Jun 2012) | 2 lines
+r43951 | gerald | 2012-07-23 17:29:04 -0700 (Mon, 23 Jul 2012) | 2 lines
Changed paths:
M /trunk-1.8/config.nmake
M /trunk-1.8/configure.in
@@ -11,837 +11,761 @@
M /trunk-1.8/version.conf
M /trunk-1.8/wiretap/Makefile.am
-1.8.0 → 1.8.1.
+1.8.1 → 1.8.2.
------------------------------------------------------------------------
-r43445 | guy | 2012-06-23 01:42:29 -0700 (Sat, 23 Jun 2012) | 13 lines
+r44086 | gerald | 2012-07-27 16:30:58 -0700 (Fri, 27 Jul 2012) | 26 lines
Changed paths:
- M /trunk-1.8/ui/gtk/capture_file_dlg.c
- M /trunk-1.8/ui/win32/file_dlg_win32.c
- M /trunk-1.8/ui/win32/file_dlg_win32.h
+ M /trunk-1.8/Makefile.nmake
+ M /trunk-1.8/packaging/nsis/Makefile.nmake
+
+Copy over revisions from the trunk:
+
+ ------------------------------------------------------------------------
+ r43965 | gerald | 2012-07-24 09:30:03 -0700 (Tue, 24 Jul 2012) | 3 lines
+ Changed paths:
+ M /trunk/packaging/nsis/Makefile.nmake
+
+ Remove uninstall_installer.exe when we're done with it so that we don't
+ have an extraneous executable in the staging directory.
+ ------------------------------------------------------------------------
+
-Copy over r43444 from the trunk:
+Copy over with manual intervention:
------------------------------------------------------------------------
- r43444 | guy | 2012-06-23 01:18:14 -0700 (Sat, 23 Jun 2012) | 8 lines
+ r43976 | gerald | 2012-07-24 16:59:42 -0700 (Tue, 24 Jul 2012) | 5 lines
+ Changed paths:
+ M /trunk/Makefile.nmake
+ M /trunk/packaging/nsis/Makefile.nmake
- In the Windows capture file "Save As" dialog code, do the same sort of
- checks for the inability to save comments that we do for UN*X. This
- should fix bug 7222, although the UI isn't currently as nice, as the
- dialog boxes are Windows dialog boxes and we don't set the button labels
- to reflect the actual choices being offered to the user. (We may be
- able to do that by using template resources to construct the message
- boxes.)
+ Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy
+ /d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
+ packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
+ files in wireshark-gt2 unnecessarily.
+ ------------------------------------------------------------------------
------------------------------------------------------------------------
-r43453 | gerald | 2012-06-24 07:33:58 -0700 (Sun, 24 Jun 2012) | 1 line
+r44102 | gerald | 2012-07-29 07:34:01 -0700 (Sun, 29 Jul 2012) | 1 line
Changed paths:
M /trunk-1.8/epan/enterprise-numbers
M /trunk-1.8/manuf
M /trunk-1.8/services
-[Automatic manuf, services and enterprise-numbers update for 2012-06-24]
-------------------------------------------------------------------------
-r43470 | gerald | 2012-06-24 16:54:26 -0700 (Sun, 24 Jun 2012) | 2 lines
-Changed paths:
- M /trunk-1.8/tools/git-compare-abis.sh
-
-"git describe --tags --abbrev=0" should work now. Use it.
-
+[Automatic manuf, services and enterprise-numbers update for 2012-07-29]
------------------------------------------------------------------------
-r43476 | guy | 2012-06-25 10:57:45 -0700 (Mon, 25 Jun 2012) | 8 lines
+r44121 | wmeier | 2012-07-29 14:43:11 -0700 (Sun, 29 Jul 2012) | 32 lines
Changed paths:
- M /trunk-1.8/ui/gtk/capture_file_dlg.c
-
-Copy over r43475 from trunk:
-
- ------------------------------------------------------------------------
- r43475 | guy | 2012-06-25 10:56:29 -0700 (Mon, 25 Jun 2012) | 3 lines
-
- In the "Save As" dialog box, default to compressed if the file is
- compressed and the default file format supports compression.
+ M /trunk-1.8/epan/dissectors/packet-nfs.c
+Copy from trunk:
------------------------------------------------------------------------
-r43478 | guy | 2012-06-25 11:38:51 -0700 (Mon, 25 Jun 2012) | 33 lines
-Changed paths:
- M /trunk-1.8/file.c
- M /trunk-1.8/file.h
- M /trunk-1.8/ui/gtk/main_menubar.c
- M /trunk-1.8/ui/gtk/main_toolbar.c
-
-Copy over r43477 from the trunk:
-
- ------------------------------------------------------------------------
- r43477 | guy | 2012-06-25 11:37:52 -0700 (Mon, 25 Jun 2012) | 28 lines
+r44111 | wmeier | 2012-07-29 14:17:17 -0400 (Sun, 29 Jul 2012) | 11 lines
- Only allow "Save" if
+Fix crash when "file_name_snooping" & "file_full_name_snooping" prefs enabled.
- the file has unsaved changes, and we can save it in some format
- through Wiretap
+Crash due to a g_snprintf() incorrect (too large) "max number of bytes" parameter.
- or
+Note that g_snprintf() apparently writes to (initializes ?) bytes beyond the
+ actual string written.
- the file is a temporary file and has no unsaved changes (so that
- "saving" it just means copying it).
+Fixes Bug #7948: (To be confirmed by the user)
+See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7498
- Only allow "Save As" if
- we can save it in some format through Wiretap
-
- or
+------------------------------------------------------------------------
+r44112 | wmeier | 2012-07-29 15:00:46 -0400 (Sun, 29 Jul 2012) | 2 lines
- the file is a temporary file and has no unsaved changes (so that
- "saving" it just means copying it).
+Cast away a compile warning: "conversion from '__int64' to 'gulong', possible loss of data"
- This means that we don't support using "Save As" for just copying the
- file unless we can do that with Wiretap; copying the file byte-for-byte
- only works as "saving" if there are no unsaved changes *and* we're
- saving it in the same format that it's in *and* we're saving it with the
- same form of compression (if any) that it has.
+------------------------------------------------------------------------
+r44113 | wmeier | 2012-07-29 15:05:18 -0400 (Sun, 29 Jul 2012) | 2 lines
- Rename cf_can_save_as() to cf_can_write_with_wiretap() to better reflect
- what it really does.
+Fix a typo :(
------------------------------------------------------------------------
-r43494 | guy | 2012-06-25 21:26:48 -0700 (Mon, 25 Jun 2012) | 8 lines
-Changed paths:
- M /trunk-1.8/ui/gtk/main_toolbar.c
+r44117 | wmeier | 2012-07-29 16:19:38 -0400 (Sun, 29 Jul 2012) | 2 lines
-Copy over r43493 from the trunk:
+g_assert --> DISSECTOR_ASSERT
- ------------------------------------------------------------------------
- r43493 | guy | 2012-06-25 21:26:04 -0700 (Mon, 25 Jun 2012) | 3 lines
-
- Have the toolbar "Save" button just be a "Save" button, working the same
- as the File -> Save menu item.
+------------------------------------------------------------------------
------------------------------------------------------------------------
-r43499 | morriss | 2012-06-26 13:43:55 -0700 (Tue, 26 Jun 2012) | 12 lines
+r44123 | wmeier | 2012-07-29 15:03:54 -0700 (Sun, 29 Jul 2012) | 9 lines
Changed paths:
- M /trunk-1.8/doc/Makefile.am
-
-Copy over from trunk:
+ M /trunk-1.8/epan/dissectors/packet-mpls-pm.c
+Copy from trunk:
------------------------------------------------------------------------
-r43498 | morriss | 2012-06-26 16:41:28 -0400 (Tue, 26 Jun 2012) | 6 lines
+r44118 | wmeier | 2012-07-29 16:39:46 -0400 (Sun, 29 Jul 2012) | 3 lines
-Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7406 :
+Several right-shifts should be left-shifts.
+See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6881#c12
-Build the idl2wrs man page (including the HTML version) but don't install
-them: a developer might want to read the man page and the Debian development
-package wants to install them.
+------------------------------------------------------------------------
+------------------------------------------------------------------------
+r44277 | gerald | 2012-08-05 07:34:04 -0700 (Sun, 05 Aug 2012) | 1 line
+Changed paths:
+ M /trunk-1.8/epan/enterprise-numbers
+ M /trunk-1.8/manuf
+ M /trunk-1.8/services
+[Automatic manuf, services and enterprise-numbers update for 2012-08-05]
------------------------------------------------------------------------
-r43502 | guy | 2012-06-26 22:17:38 -0700 (Tue, 26 Jun 2012) | 12 lines
+r44309 | gerald | 2012-08-07 12:29:44 -0700 (Tue, 07 Aug 2012) | 16 lines
Changed paths:
- M /trunk-1.8/dumpcap.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-dcp-etsi.c
-Copy over r43501 from the trunk:
+Copy over r44247 from the trunk:
------------------------------------------------------------------------
- r43501 | guy | 2012-06-26 22:13:06 -0700 (Tue, 26 Jun 2012) | 7 lines
-
- Don't supply a fallback error message for pcap_open() unless it actually
- fails.
+ r44247 | morriss | 2012-08-03 09:20:31 -0700 (Fri, 03 Aug 2012) | 6 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-dcp-etsi.c
- This may clear up the problem most recently reported in bug 7021 after
- the crash was fixed, where the capture starts successfully but an error
- dialog pops up.
+ Fix fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7566 :
-------------------------------------------------------------------------
-r43512 | wmeier | 2012-06-27 08:19:24 -0700 (Wed, 27 Jun 2012) | 32 lines
-Changed paths:
- M /trunk-1.8/ui/gtk/dfilter_expr_dlg.c
- M /trunk-1.8/ui/gtk/proto_hier_tree_model.c
+ Don't try to reassemble a message of length 0 (fixes a later divide-by-zero
+ error but I don't see why we'd want to do any work for message whose length
+ we think is 0).
+ ------------------------------------------------------------------------
-Copy over r43506, r43507 and r43511 from trunk:
+Update the release notes.
------------------------------------------------------------------------
-r43506 | wmeier | 2012-06-27 09:37:13 -0400 (Wed, 27 Jun 2012) | 7 lines
-
-From Jakub Zawadzki: Fix "typeahead search broken in Display Filter Expression Window"
-
-Revert SVN #42291.
+r44342 | gerald | 2012-08-08 08:56:25 -0700 (Wed, 08 Aug 2012) | 16 lines
+Changed paths:
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-mongo.c
-Fixes Bug #7412: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7412
+Copy over r44288 from the trunk:
-------------------------------------------------------------------------
-r43507 | wmeier | 2012-06-27 09:57:39 -0400 (Wed, 27 Jun 2012) | 7 lines
+ ------------------------------------------------------------------------
+ r44288 | gerald | 2012-08-06 15:04:09 -0700 (Mon, 06 Aug 2012) | 6 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-mongo.c
-Fix for "predefined values sometimes missing in Display Filter Expression window.
+ Check for a too-short BSON document length. Fixes a DoS reported by Ben
+ Schmidt in bug 7572.
-See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7413
+ Also check for a too-long BSON document length and too many nested BSON
+ documents.
+ ------------------------------------------------------------------------
-Essentially: BASE_CUSTOM was being used as a mask rather than a field value.
+Update the release notes.
------------------------------------------------------------------------
-r43511 | wmeier | 2012-06-27 10:58:32 -0400 (Wed, 27 Jun 2012) | 9 lines
+r44343 | gerald | 2012-08-08 09:09:52 -0700 (Wed, 08 Aug 2012) | 20 lines
+Changed paths:
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-xtp.c
-Commit file which should have been part of SVN #43506
+Copy over r44289 from the trunk:
-From Jakub Zawadzki: Fix "typeahead search broken in Display Filter Expression Window"
+ ------------------------------------------------------------------------
+ r44289 | gerald | 2012-08-06 16:12:13 -0700 (Mon, 06 Aug 2012) | 10 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-xtp.c
- Revert SVN #42291.
+ Add a maximum span length check to XTP. Fixes a crash discovered by Ben
+ Schmidt.
- Fixes Bug #7412: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7412
+ Just use proto_tree_add_item() instead of allocating a
+ big-ol-honkin'-block of guint64s and adding their values to the tree via
+ proto_tree_add_uint64().
+ Dissection *should* still work correctly but I can't find any XTP
+ captures for testing.
+ ------------------------------------------------------------------------
-------------------------------------------------------------------------
-r43552 | gerald | 2012-07-01 07:34:00 -0700 (Sun, 01 Jul 2012) | 1 line
-Changed paths:
- M /trunk-1.8/epan/enterprise-numbers
- M /trunk-1.8/manuf
- M /trunk-1.8/services
+Update the release notes.
-[Automatic manuf, services and enterprise-numbers update for 2012-07-01]
------------------------------------------------------------------------
-r43562 | guy | 2012-07-03 13:20:37 -0700 (Tue, 03 Jul 2012) | 23 lines
+r44347 | gerald | 2012-08-08 09:40:12 -0700 (Wed, 08 Aug 2012) | 18 lines
Changed paths:
- M /trunk-1.8/Makefile.am
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-erf.c
-Copy over r43561 from trunk:
+Copy over revisions from the trunk:
------------------------------------------------------------------------
- r43561 | guy | 2012-07-03 13:12:50 -0700 (Tue, 03 Jul 2012) | 18 lines
-
- As per Gentoo bug 423743
-
- https://bugs.gentoo.org/show_bug.cgi?id=423743
-
- "The Makefile.am claims including GLIB_LIBS when linking wireshark is
- unnecessary, because wireshark links to GTK_LIBS which is a superset.
- It is not actually a superset: gmodule is included in GLIB_LIBS but
- not in GTK_LIBS (unless accidentally on older glibs/gtks)."
-
- so we must explicitly link with GLIB_LIBS.
+ r44306 | morriss | 2012-08-07 11:17:29 -0700 (Tue, 07 Aug 2012) | 8 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-erf.c
- Update the comment to reflect that - and to reflect that GTK+ doesn't
- necessarily run atop X11 - while we're at it.
+ Fix fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
- Fixes bug 7427.
+ Don't overflow in_fmt->m_vc_index_array: verify that speed is less than or
+ equal to DECHAN_MAX_AUG_INDEX before using it.
- #BACKPORT
+ Also add a comment: there are comments here that indicate that this array
+ should have 5 entries but there are only 4.
+ ------------------------------------------------------------------------
-------------------------------------------------------------------------
-r43612 | gerald | 2012-07-08 07:33:57 -0700 (Sun, 08 Jul 2012) | 1 line
-Changed paths:
- M /trunk-1.8/epan/enterprise-numbers
- M /trunk-1.8/manuf
- M /trunk-1.8/services
+Update the release notes.
-[Automatic manuf, services and enterprise-numbers update for 2012-07-08]
------------------------------------------------------------------------
-r43650 | guy | 2012-07-10 12:17:01 -0700 (Tue, 10 Jul 2012) | 13 lines
+r44350 | gerald | 2012-08-08 10:24:27 -0700 (Wed, 08 Aug 2012) | 15 lines
Changed paths:
- M /trunk-1.8/wiretap/pcapng.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-afp.c
-Copy over r43649 from the trunk:
+Copy over revisions from the trunk:
------------------------------------------------------------------------
- r43649 | guy | 2012-07-10 12:12:37 -0700 (Tue, 10 Jul 2012) | 10 lines
+ r44317 | gerald | 2012-08-07 16:06:29 -0700 (Tue, 07 Aug 2012) | 5 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-afp.c
- When writing an EPB, calculate the time stamp based on the resolution
- for the interface, not based on the default resolution of 1 microsecond.
- Fixes bug 7457.
+ Fix a large loop found by Stefan Cornelius of Red Hat Security Response
+ Team (bug 7603).
- Fix a comment.
+ Display the ACL entry count as decimal instead of hexadecimal.
+ ------------------------------------------------------------------------
- Clean up indentation.
+Update the release notes.
------------------------------------------------------------------------
-r43653 | guy | 2012-07-10 13:00:39 -0700 (Tue, 10 Jul 2012) | 11 lines
+r44353 | gerald | 2012-08-08 11:41:48 -0700 (Wed, 08 Aug 2012) | 18 lines
Changed paths:
- M /trunk-1.8/wiretap/file_access.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-rtps2.c
-Copy over r43652 from trunk:
+Copy over revisions from the trunk:
------------------------------------------------------------------------
- r43652 | guy | 2012-07-10 12:59:39 -0700 (Tue, 10 Jul 2012) | 6 lines
-
- Set the time units per second correctly if, in wtap_dump_open_ng(),
- we're making a fake interface description (it should match the time
- stamp resolution). The dump code for pcap-NG now requires the time
- units per second value, as it needs to correctly compute the time stamp
- value to write out in an EPB.
-
-------------------------------------------------------------------------
-r43656 | guy | 2012-07-10 20:51:22 -0700 (Tue, 10 Jul 2012) | 11 lines
-Changed paths:
- M /trunk-1.8/wiretap/file_access.c
+ r44320 | gerald | 2012-08-07 17:40:03 -0700 (Tue, 07 Aug 2012) | 7 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-rtps2.c
-Copy over r43655 from trunk:
+ Use ep_strbufs instead of trying to track string offsets manually
+ and overflowing a buffer. Fixes a crash in bug 7568 discovered by
+ Laurent Butti.
+ We do the Dance Of The String Offset Pointers in several other
+ places. They should probably be changed to ep_strbufs as well.
------------------------------------------------------------------------
- r43655 | guy | 2012-07-10 20:50:28 -0700 (Tue, 10 Jul 2012) | 8 lines
- AARGH. There are two lumps of (almost-)identical code to handle
- interface information when opening an output file, one of which I fixed
- in my previous checkin and the other of which I didn't notice. Shuffle
- code around a little bit so that the lumps are identical and then put
- them into a common routine (*with* the fix in question).
+
+Update the release notes.
------------------------------------------------------------------------
-r43658 | guy | 2012-07-10 20:58:12 -0700 (Tue, 10 Jul 2012) | 17 lines
+r44356 | gerald | 2012-08-08 12:02:51 -0700 (Wed, 08 Aug 2012) | 21 lines
Changed paths:
- M /trunk-1.8/wiretap/pcapng.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-gsm_rlcmac.h
-Copy over r43657 from trunk:
+Copy over revisions from the trunk:
------------------------------------------------------------------------
- r43657 | guy | 2012-07-10 20:57:13 -0700 (Tue, 10 Jul 2012) | 14 lines
+ r44307 | gerald | 2012-08-07 11:36:18 -0700 (Tue, 07 Aug 2012) | 4 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-gsm_rlcmac.h
- Don't ask for information about an interface greater than the maximum
- interface for which we have information.
+ Make sure we have a corresponding 'u' member to RlcMacDownlink_t for
+ every call to csnStreamDissector. This should fix bug 7561. Based on
+ attachment 8888 from Martin Kaiser.
+ ------------------------------------------------------------------------
+ r44319 | pascal | 2012-08-07 17:11:14 -0700 (Tue, 07 Aug 2012) | 2 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-gsm_rlcmac.h
- Fixes bug 7467.
+ Remove Uplink messages from the RlcMacDownlink_t structure (as they are part of the RlcMacUplink_t structure that is also used to call csnStreamDissector function)
+ ------------------------------------------------------------------------
- Should also cause an error message, rather than an unreadable capture
- file, to be produced for the cases in bug 7381. (This isn't a fix for
- bug 7381; it's arguably an improvement, in the sense that a circuit
- breaker tripping or a fuse blowing for a short circuit is an improvement
- over a fire starting, but it's not a *fix*, any more than a circuit
- break or fuse *fixes* the short circuit.)
-------------------------------------------------------------------------
-r43721 | gerald | 2012-07-15 07:34:01 -0700 (Sun, 15 Jul 2012) | 1 line
-Changed paths:
- M /trunk-1.8/epan/enterprise-numbers
- M /trunk-1.8/manuf
- M /trunk-1.8/services
+Update the release notes.
-[Automatic manuf, services and enterprise-numbers update for 2012-07-15]
------------------------------------------------------------------------
-r43799 | guy | 2012-07-18 16:00:46 -0700 (Wed, 18 Jul 2012) | 8 lines
+r44360 | gerald | 2012-08-08 13:52:36 -0700 (Wed, 08 Aug 2012) | 12 lines
Changed paths:
- M /trunk-1.8/epan/dissectors/packet-bittorrent.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-cip.c
-Copy over r43798 from the trunk:
+Copy over r44312 from the trunk:
------------------------------------------------------------------------
- r43798 | guy | 2012-07-18 15:59:54 -0700 (Wed, 18 Jul 2012) | 3 lines
-
- Fix a non-proto_tree_add_item() passing an ENC_ value as the last
- argument.
-
-------------------------------------------------------------------------
-r43801 | guy | 2012-07-18 16:14:48 -0700 (Wed, 18 Jul 2012) | 8 lines
-Changed paths:
- M /trunk-1.8/epan/dissectors/packet-brp.c
-
-Copy over r43800 from trunk:
+ r44312 | mmann | 2012-08-07 13:09:59 -0700 (Tue, 07 Aug 2012) | 1 line
+ Changed paths:
+ M /trunk/epan/dissectors/packet-cip.c
+ Add a sanity check so we don't unnecessarily allocate memory for a Multiple Service Packet message. Bugfix 7570 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7570)
------------------------------------------------------------------------
- r43800 | guy | 2012-07-18 16:06:20 -0700 (Wed, 18 Jul 2012) | 3 lines
- Fix a non-proto_tree_add_item() passing an ENC_ value as the last
- argument.
+Update the release notes.
------------------------------------------------------------------------
-r43803 | guy | 2012-07-18 16:19:39 -0700 (Wed, 18 Jul 2012) | 8 lines
+r44367 | gerald | 2012-08-08 17:26:42 -0700 (Wed, 08 Aug 2012) | 14 lines
Changed paths:
- M /trunk-1.8/epan/dissectors/packet-capwap.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-stun.c
-Copy over r43802 from trunk:
+Copy over r44366 from the trunk:
------------------------------------------------------------------------
- r43802 | guy | 2012-07-18 16:18:01 -0700 (Wed, 18 Jul 2012) | 3 lines
+ r44366 | gerald | 2012-08-08 17:20:18 -0700 (Wed, 08 Aug 2012) | 4 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-stun.c
- Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
- argument.
+ se_tree_lookup32_array() can destroy its key. Make sure we refresh it
+ before passing it to se_tree_insert32_array(). Fixes bug 7569 reported
+ by Laurent Butti.
+ ------------------------------------------------------------------------
+
+Update the release notes.
------------------------------------------------------------------------
-r43805 | guy | 2012-07-18 16:28:32 -0700 (Wed, 18 Jul 2012) | 8 lines
+r44389 | gerald | 2012-08-09 10:40:45 -0700 (Thu, 09 Aug 2012) | 17 lines
Changed paths:
- M /trunk-1.8/epan/dissectors/packet-dnp.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/plugins/ethercat/packet-ecatmb.c
+
+Copy over r43149 from the trunk:
-Copy over r43804 from trunk:
+ ------------------------------------------------------------------------
+ r43149 | wmeier | 2012-06-07 13:16:28 -0700 (Thu, 07 Jun 2012) | 6 lines
+ Changed paths:
+ M /trunk/plugins/ethercat/packet-ecatmb.c
+ Attempt to fix display of "eoe macfilter header".
+ Among other things: fix incorrect 'display' value in several hf[] entries.
+ (See XXX coments in source for further details).
+ Attempt to fix use of incorrect value in hf[] entry 'display' fields
------------------------------------------------------------------------
- r43804 | guy | 2012-07-18 16:27:37 -0700 (Wed, 18 Jul 2012) | 3 lines
- Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
- argument.
+Fixes an abort reported by Laurent Butti in bug 7562.
+
+Update the release notes.
------------------------------------------------------------------------
-r43807 | guy | 2012-07-18 16:31:48 -0700 (Wed, 18 Jul 2012) | 8 lines
+r44396 | morriss | 2012-08-09 12:20:18 -0700 (Thu, 09 Aug 2012) | 43 lines
Changed paths:
- M /trunk-1.8/epan/dissectors/packet-elcom.c
+ M /trunk-1.8/diameter/Ericsson.xml
+ M /trunk-1.8/diameter/dictionary.xml
-Copy over r43806 from trunk:
+Copy over Diameter XMLs from trunk; this includes these revisions:
------------------------------------------------------------------------
- r43806 | guy | 2012-07-18 16:30:45 -0700 (Wed, 18 Jul 2012) | 3 lines
+ r44394 | morriss | 2012-08-09 14:30:49 -0400 (Thu, 09 Aug 2012) | 1 line
- Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
- argument.
-
-------------------------------------------------------------------------
-r43809 | guy | 2012-07-18 16:36:30 -0700 (Wed, 18 Jul 2012) | 8 lines
-Changed paths:
- M /trunk-1.8/epan/dissectors/packet-ieee80211.c
+ Fix up indentation.
+ ------------------------------------------------------------------------
+ r44128 | etxrab | 2012-07-30 03:37:24 -0400 (Mon, 30 Jul 2012) | 4 lines
-Copy over r43808 from trunk:
+ From e.yimjia:
+ Diameter AVP:s for SLh interface.
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7539
------------------------------------------------------------------------
- r43808 | guy | 2012-07-18 16:34:59 -0700 (Wed, 18 Jul 2012) | 3 lines
+ r44054 | morriss | 2012-07-26 14:33:59 -0400 (Thu, 26 Jul 2012) | 1 line
- Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
- argument.
+ Add 3GPP Sy (29.219) command codes, AVPs, and appID.
+ ------------------------------------------------------------------------
+ r43625 | etxrab | 2012-07-09 10:10:40 -0400 (Mon, 09 Jul 2012) | 1 line
-------------------------------------------------------------------------
-r43811 | guy | 2012-07-18 16:38:53 -0700 (Wed, 18 Jul 2012) | 8 lines
-Changed paths:
- M /trunk-1.8/epan/dissectors/packet-m2ua.c
+ Update AVP dissection.
+ ------------------------------------------------------------------------
+ r43472 | morriss | 2012-06-25 00:41:36 -0400 (Mon, 25 Jun 2012) | 9 lines
-Copy over r43810 from trunk:
+ From Rick Mortensen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4128 :
- ------------------------------------------------------------------------
- r43810 | guy | 2012-07-18 16:37:59 -0700 (Wed, 18 Jul 2012) | 3 lines
+ Add Ericsson-proprietary AVPs and Result-Codes for SCAP.
- Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
- argument.
+ Add Huawei as a known vendor.
-------------------------------------------------------------------------
-r43813 | guy | 2012-07-18 16:45:08 -0700 (Wed, 18 Jul 2012) | 8 lines
-Changed paths:
- M /trunk-1.8/epan/dissectors/packet-zbee-aps.c
+ From me:
+ Reindent the Ericsson XML file; sort the new AVPs by number.
-Copy over r43812 from trunk:
+ ------------------------------------------------------------------------
+ r43205 | morriss | 2012-06-11 12:05:38 -0400 (Mon, 11 Jun 2012) | 1 line
+ S9 AVPs start at 2200.
------------------------------------------------------------------------
- r43812 | guy | 2012-07-18 16:44:15 -0700 (Wed, 18 Jul 2012) | 3 lines
+ r43199 | etxrab | 2012-06-11 03:48:14 -0400 (Mon, 11 Jun 2012) | 1 line
+
+ Add a reference to TGPPS9.xml update a couple of AVP:s while at it.
- Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
- argument.
------------------------------------------------------------------------
-r43839 | gerald | 2012-07-19 17:17:42 -0700 (Thu, 19 Jul 2012) | 18 lines
+r44404 | gerald | 2012-08-09 15:12:51 -0700 (Thu, 09 Aug 2012) | 13 lines
Changed paths:
M /trunk-1.8/docbook/release-notes.xml
- M /trunk-1.8/epan/dissectors/packet-ppp.c
+ M /trunk-1.8/epan/dissectors/packet-ctdb.c
-Copy over revisions from the trunk:
+Copy over r44403 from the trunk:
------------------------------------------------------------------------
- r43784 | rbalint | 2012-07-18 08:14:45 -0700 (Wed, 18 Jul 2012) | 6 lines
+ r44403 | gerald | 2012-08-09 15:04:46 -0700 (Thu, 09 Aug 2012) | 3 lines
Changed paths:
- M /trunk/epan/dissectors/packet-ppp.c
+ M /trunk/epan/dissectors/packet-ctdb.c
- Fix crash in PPP dissector
-
- Make sure that there is enough space allocated for PPP encapsulated CRTP
- packet's header.
- The bug can be triggered on an x86_64 system using the cpature file attached to
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056
+ Add a check for the number of nodes. Fixes a DoS in bug 7573 reported by
+ Ben Schmidt.
------------------------------------------------------------------------
-
Update the release notes.
------------------------------------------------------------------------
-r43840 | gerald | 2012-07-19 17:36:09 -0700 (Thu, 19 Jul 2012) | 76 lines
+r44409 | gerald | 2012-08-09 16:44:52 -0700 (Thu, 09 Aug 2012) | 70 lines
Changed paths:
- M /trunk-1.8/asn1/snmp/packet-snmp-template.c
M /trunk-1.8/docbook/release-notes.xml
- M /trunk-1.8/epan/dissectors/packet-bootp.c
- M /trunk-1.8/epan/dissectors/packet-eap.c
- M /trunk-1.8/epan/dissectors/packet-icmp.c
- M /trunk-1.8/epan/dissectors/packet-icmpv6.c
- M /trunk-1.8/epan/dissectors/packet-ieee80211.c
- M /trunk-1.8/epan/dissectors/packet-nas_eps.c
- M /trunk-1.8/epan/dissectors/packet-nfs.c
- M /trunk-1.8/epan/dissectors/packet-snmp.c
- M /trunk-1.8/epan/dissectors/packet-tcp.c
+ M /trunk-1.8/epan/column-utils.c
+ M /trunk-1.8/epan/dissectors/packet-giop.c
+ M /trunk-1.8/epan/dissectors/packet-gtpv2.c
+ M /trunk-1.8/epan/dissectors/packet-x25.c
+ M /trunk-1.8/epan/tfs.c
+ M /trunk-1.8/epan/tfs.h
+ M /trunk-1.8/ui/gtk/capture_dlg.c
+ M /trunk-1.8/ui/gtk/main.c
M /trunk-1.8/ui/gtk/main_menubar.c
Copy over revisions from the trunk:
------------------------------------------------------------------------
- r43443 | pascal | 2012-06-22 13:44:52 -0700 (Fri, 22 Jun 2012) | 3 lines
+ r43930 | etxrab | 2012-07-23 08:27:52 -0700 (Mon, 23 Jul 2012) | 4 lines
Changed paths:
- M /trunk/epan/dissectors/packet-bootp.c
+ M /trunk/epan/dissectors/packet-gtpv2.c
+ M /trunk/epan/tfs.c
+ M /trunk/epan/tfs.h
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7391 :
- Do not use same name for filters with incompatible types
+ Fix reversed values for Bearer Context IE decodes Bearer Level Quality of Service (Bearer QoS) in ARP field the wireshark decoded preemption values.
+
+ As reported in
+ http://ask.wireshark.org/questions/12907/pre-emption-decoding-on-s11-interface
------------------------------------------------------------------------
- r43448 | pascal | 2012-06-23 07:36:21 -0700 (Sat, 23 Jun 2012) | 2 lines
+ r43953 | etxrab | 2012-07-23 22:51:42 -0700 (Mon, 23 Jul 2012) | 1 line
Changed paths:
- M /trunk/epan/dissectors/packet-icmp.c
- M /trunk/epan/dissectors/packet-icmpv6.c
- M /trunk/epan/dissectors/packet-tcp.c
+ M /trunk/ui/gtk/main_menubar.c
- Do not use same name for filters with incompatible types
+ Reinsert conversation colorization shortcuts
------------------------------------------------------------------------
- r43474 | pascal | 2012-06-25 04:12:54 -0700 (Mon, 25 Jun 2012) | 2 lines
+ r43955 | etxrab | 2012-07-24 03:25:13 -0700 (Tue, 24 Jul 2012) | 4 lines
Changed paths:
- M /trunk/epan/dissectors/packet-nas_eps.c
+ M /trunk/epan/dissectors/packet-giop.c
- Fix dissection of NAS EPS Service Request message (broken in r42200)
+ From Peng Di:
+ GIOP request_id used for sub dissectors is not assigned when decoding GIOP 1.2 Request message.
+
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7516
------------------------------------------------------------------------
- r43556 | alagoutte | 2012-07-03 05:28:06 -0700 (Tue, 03 Jul 2012) | 10 lines
+ r43956 | etxrab | 2012-07-24 04:47:23 -0700 (Tue, 24 Jul 2012) | 6 lines
Changed paths:
- M /trunk/epan/dissectors/packet-ieee80211.c
-
- From report of Dennis Mendoza via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7429
- Wireshark > 1.4 does not correctly read Association ID for PS Poll packets
+ M /trunk/epan/dissectors/packet-x25.c
- Wireless Frame with subtype 0x1a don't interpret the Association ID (always 0).
+ From Karsten Keil:
+ ISDN LAPD X.31 packet traffic can not be decoded
- Fix :
- proto_tree_add_uint() wasn't changed to proto_tree_add_item()
+ X.31 is X.25 over ISDN. It use SAPI 16 LAPD service.
- #BACKPORT
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7514
------------------------------------------------------------------------
- r43560 | pascal | 2012-07-03 13:07:53 -0700 (Tue, 03 Jul 2012) | 3 lines
+ r43957 | etxrab | 2012-07-24 05:20:18 -0700 (Tue, 24 Jul 2012) | 3 lines
Changed paths:
- M /trunk/epan/dissectors/packet-eap.c
+ M /trunk/epan/column-utils.c
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7430 :
- Dissection of EAP-SIM and EAP-AKA is broken
+ Use the correct symbols
+ COL_UTC_TIME and COL_UTC_DATE_TIME
+ insted of TS_UTC and TS_UTC_WITH_DATE.
------------------------------------------------------------------------
- r43576 | darkjames | 2012-07-05 14:09:34 -0700 (Thu, 05 Jul 2012) | 6 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-nfs.c
- Fix bug #7436
- offset returned from dissect_nfs_open_claim4, dissect_nfs_openflag4 were different
- when we were building tree and where we didn't.
- Fix other similar cases.
+Copy over with manual intervention:
+
------------------------------------------------------------------------
- r43600 | morriss | 2012-07-07 07:54:14 -0700 (Sat, 07 Jul 2012) | 5 lines
+ r43922 | martink | 2012-07-22 15:09:46 -0700 (Sun, 22 Jul 2012) | 8 lines
Changed paths:
- M /trunk/ui/gtk/main_menubar.c
+ M /trunk/ui/gtk/capture_dlg.c
+ M /trunk/ui/gtk/iface_lists.c
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7445 :
+ initialize required interface_t components of a newly created interface
- "Find Next Mark" was duplicated in the Edit menu and "Find Previous Mark" was
- missing (the 2nd "Find Next Mark" would, if selected, find the previous mark).
- ------------------------------------------------------------------------
- r43648 | pascal | 2012-07-10 08:43:03 -0700 (Tue, 10 Jul 2012) | 3 lines
- Changed paths:
- M /trunk/asn1/snmp/packet-snmp-template.c
- M /trunk/epan/dissectors/packet-snmp.c
+ this should fix crashes in the interface list handling when the
+ interface list contains pipes initliazed by scan_local_interfaces() or
+ add_pipe_cb()
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438 :
- Do not call tvb_ensure_length_remaining on an empty tvb
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7511
------------------------------------------------------------------------
Update the release notes.
------------------------------------------------------------------------
-r43842 | gerald | 2012-07-19 17:45:59 -0700 (Thu, 19 Jul 2012) | 57 lines
+r44410 | gerald | 2012-08-09 17:08:03 -0700 (Thu, 09 Aug 2012) | 48 lines
Changed paths:
- M /trunk-1.8/asn1/h248/packet-h248-template.c
M /trunk-1.8/docbook/release-notes.xml
- M /trunk-1.8/epan/dissectors/packet-dvbci.c
- M /trunk-1.8/epan/dissectors/packet-h248.c
- M /trunk-1.8/epan/dissectors/packet-h248_annex_e.c
- M /trunk-1.8/epan/dissectors/packet-ses.c
- M /trunk-1.8/image/file_dlg_win32.rc
+ M /trunk-1.8/dumpcap.c
+ M /trunk-1.8/epan/dissectors/packet-gsm_a_common.c
M /trunk-1.8/ui/gtk/main.c
- M /trunk-1.8/ui/win32/file_dlg_win32.c
+ M /trunk-1.8/ui/gtk/main.h
+ M /trunk-1.8/ui/gtk/main_menubar.c
Copy over revisions from the trunk:
------------------------------------------------------------------------
- r43661 | etxrab | 2012-07-11 07:40:35 -0700 (Wed, 11 Jul 2012) | 3 lines
- Changed paths:
- M /trunk/asn1/h248/packet-h248-template.c
- M /trunk/epan/dissectors/packet-h248.c
-
- Revert part of revision 43107 which broke sub dissection of
- Signal and events as a new tvb wasn't created.
- |BASE_EXT_STRING also removed.
- ------------------------------------------------------------------------
- r43662 | etxrab | 2012-07-11 07:41:21 -0700 (Wed, 11 Jul 2012) | 1 line
+ r43961 | etxrab | 2012-07-24 08:03:59 -0700 (Tue, 24 Jul 2012) | 8 lines
Changed paths:
- M /trunk/epan/dissectors/packet-h248_annex_e.c
+ M /trunk/ui/gtk/main.c
+ M /trunk/ui/gtk/main.h
+ M /trunk/ui/gtk/main_menubar.c
- failure cause is an OCTET STRING not a string.
- ------------------------------------------------------------------------
- r43668 | pascal | 2012-07-11 13:20:10 -0700 (Wed, 11 Jul 2012) | 3 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-dvbci.c
+ Analyze->Apply as Filter and Analyze->Prepare a Filter cause crashes
- From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7468 :
- DVB-CI/CI+: fix offset error in operator_info apdu
- ------------------------------------------------------------------------
- r43676 | gerald | 2012-07-11 14:25:42 -0700 (Wed, 11 Jul 2012) | 3 lines
- Changed paths:
- M /trunk/image/file_dlg_win32.rc
- M /trunk/ui/win32/file_dlg_win32.c
+ user_data is NULL in the callbacks from the menu_bar, and when preparing filters we need to find the filter widget with g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY).
+ The object is saved in the global variable popup_menu_object.
+ Use that in the filter callbacks from the menu bar.
+ - remove unused widget from a couple of callbacks.
- MSDN says DIALOG resources are obsolete. Use DIALOGEXes instead. We aren't
- adding extra controls to the save dialog any more so remove its template.
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7506
------------------------------------------------------------------------
- r43763 | darkjames | 2012-07-17 06:01:17 -0700 (Tue, 17 Jul 2012) | 5 lines
+ r43999 | etxrab | 2012-07-25 08:15:16 -0700 (Wed, 25 Jul 2012) | 6 lines
Changed paths:
- M /trunk/epan/dissectors/packet-ses.c
+ M /trunk/ui/gtk/main_menubar.c
- Fix bug #7488: Unable to correctly identify IEC 61850 MMS packets
+ Unify the AktionEntries for apply/prepare filter we should probably
+ do the same type thing for the ui_desciptions.
- In r39066 was added 'final check to see if the next SPDU, if present, is also valid',
- but it didn't properly check for tvb length which causes exception if there's no next SPDU.
+ eg put a "place holder" in the UI descriptions and
+ make a call from main_menubar.c i.e add_filter_menu()
+ and do the UI stuff there.
------------------------------------------------------------------------
+ r43981 | tuexen | 2012-07-25 00:08:20 -0700 (Wed, 25 Jul 2012) | 4 lines
+ Changed paths:
+ M /trunk/dumpcap.c
-
-Copy over with manual intervention:
-
+ Update recv/drop counters also when no threads are used.
+ This should fix
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7523
------------------------------------------------------------------------
- r43790 | etxrab | 2012-07-18 12:44:54 -0700 (Wed, 18 Jul 2012) | 1 line
+ r44008 | pascal | 2012-07-25 13:04:33 -0700 (Wed, 25 Jul 2012) | 3 lines
Changed paths:
- M /trunk/ui/gtk/main.c
+ M /trunk/epan/dissectors/packet-gsm_a_common.c
- From Jakub Zawadzki use gtk_box_pack_start isof gtk_container_add fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7377
+ Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7524 :
+ 8-PSK structure in GSM Classmark 3 is not properly dissected
------------------------------------------------------------------------
Update the release notes.
------------------------------------------------------------------------
-r43863 | guy | 2012-07-20 10:35:49 -0700 (Fri, 20 Jul 2012) | 34 lines
+r44417 | etxrab | 2012-08-10 02:28:23 -0700 (Fri, 10 Aug 2012) | 1 line
Changed paths:
- M /trunk-1.8/file.c
- M /trunk-1.8/wiretap/Makefile.am
- M /trunk-1.8/wiretap/file_access.c
- M /trunk-1.8/wiretap/wtap.def
- M /trunk-1.8/wiretap/wtap.h
-
-Copy over r43847 from trunk:
-
- ------------------------------------------------------------------------
- r43847 | guy | 2012-07-19 21:00:29 -0700 (Thu, 19 Jul 2012) | 21 lines
-
- Add a routine that, given a set of packet encapsulation types, returns
- the per-file encapsulation type needed to write out a set of packets
- with all those encapsulation types. If there's only one such
- encapsulation type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is
- needed. Use that in wtap_dump_can_write_encaps().
-
- Also use it in cf_save_packets() and cf_export_specified_packets(), so
- that we can write out files with WTAP_ENCAP_PER_PACKET as the file
- encapsulation type and only one actual per-packet encapsulation type in
- some cases where that failed before. This fixes the case that showed up
- in bug 7505, although there are other cases where we *could* write out a
- capture in a given file format but won't be able to do so; fixing those
- will take more work.
-
- #BACKPORT
-
- (Note: this adds a routine to libwiretap, so, when backported, the
- *minor* version of the library should be increased. Code that worked
- with the version of the library prior to this change will continue to
- work, so there's no need to change the *major* version of the library.)
-
-Rev library version stuff according to
-
- http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-
-which, at least when building for OS X, does the right thing - the
-library minor version number in the file name goes from 0 to 1, but the
-major version is unchanged.
+ M /trunk-1.8/ui/gtk/old-gtk-compat.h
+Copy over Revision 43536 Update Free Software Foundation address. Compability macros from Revision 43728 Revision 43734 Revision 43735 Revision 44186. In case they are needed by other fixes
------------------------------------------------------------------------
-r43865 | gerald | 2012-07-20 11:00:20 -0700 (Fri, 20 Jul 2012) | 20 lines
+r44427 | gerald | 2012-08-10 10:22:20 -0700 (Fri, 10 Aug 2012) | 15 lines
Changed paths:
M /trunk-1.8/docbook/release-notes.xml
- M /trunk-1.8/packaging/nsis/Makefile.nmake
- M /trunk-1.8/packaging/nsis/wireshark.nsi
+ M /trunk-1.8/wiretap/pcapng.c
-Copy over r43864 from the trunk:
+Copy over r44074 from the trunk:
------------------------------------------------------------------------
- r43864 | gerald | 2012-07-20 10:56:16 -0700 (Fri, 20 Jul 2012) | 8 lines
+ r44074 | tuexen | 2012-07-27 11:43:53 -0700 (Fri, 27 Jul 2012) | 4 lines
Changed paths:
- M /trunk/packaging/nsis/Makefile.nmake
- M /trunk/packaging/nsis/wireshark.nsi
-
- According to
+ M /trunk/wiretap/pcapng.c
- http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx
-
- and bug 7507 the Visual C++ 2010 redistributable installer might want
- to reboot the system. Tell it not to do that and request a reboot at
- the end of the installation process if needed.
+ Handle the case where no IDB follows the SHB. This fixes part of
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7533
+ which deals with Div by 0 crash in pcapng_read_packet_block().
------------------------------------------------------------------------
Update the release notes.
------------------------------------------------------------------------
-r43876 | guy | 2012-07-20 17:13:17 -0700 (Fri, 20 Jul 2012) | 12 lines
+r44428 | gerald | 2012-08-10 10:24:23 -0700 (Fri, 10 Aug 2012) | 16 lines
Changed paths:
- M /trunk-1.8/file.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/wiretap/vwr.c
-Copy over r43875 from trunk:
+Copy over r44075 from the trunk:
------------------------------------------------------------------------
- r43875 | guy | 2012-07-20 17:12:21 -0700 (Fri, 20 Jul 2012) | 7 lines
-
- simple_message_box() does not expect Pango markup, so escaping is
- not necessary, and just messes up the display.
-
- Fixes bug 7489.
-
- #BACKPORT
-
-------------------------------------------------------------------------
-r43881 | guy | 2012-07-20 18:25:56 -0700 (Fri, 20 Jul 2012) | 14 lines
-Changed paths:
- M /trunk-1.8/epan/dissectors/packet-reload-framing.c
-
-Copy over r43880 from trunk:
+ r44075 | tuexen | 2012-07-27 11:59:29 -0700 (Fri, 27 Jul 2012) | 5 lines
+ Changed paths:
+ M /trunk/wiretap/vwr.c
+ It seems that the length should unsigned, not signed.
+ This fixes part of
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7533
+ which deals with Crash in vwr.c while reading the capture file.
------------------------------------------------------------------------
- r43880 | guy | 2012-07-20 18:24:54 -0700 (Fri, 20 Jul 2012) | 9 lines
- The 32-bit-key tree code assumes that the pointer to the key can be cast
- to a pointer to a guint32 and dereferenced. On some platforms, such as
- SPARC, this requires that the pointer be aligned on a 4-byte boundary;
- there is no guarantee that the data field of an address structure is
- aligned on a 4-byte boundary, so allocate a buffer for a copy of that
- data and copy the data into it, and free it when we're done with it.
- Should fix bug 7501.
+Update the release notes.
------------------------------------------------------------------------
-r43884 | pascal | 2012-07-21 03:09:16 -0700 (Sat, 21 Jul 2012) | 10 lines
+r44430 | gerald | 2012-08-10 10:51:09 -0700 (Fri, 10 Aug 2012) | 63 lines
Changed paths:
- M /trunk-1.8/epan/dissectors/packet-jmirror.c
-
-Copy over r43759 from trunk:
-
-------------------------------------------------------------------------
-r43759 | pascal | 2012-07-17 09:33:20 +0200 (mar. 17 juil. 2012) | 3 lignes
-
-From Wayne Brassem via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7485 :
-Add support for IPv6 over PPP in Jmirror dissector
-
-------------------------------------------------------------------------
+ M /trunk-1.8/capture.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-dns.c
+ M /trunk-1.8/epan/dissectors/packet-gtp.c
+ M /trunk-1.8/epan/dissectors/packet-gtpv2.c
+ M /trunk-1.8/epan/dissectors/packet-mpls-y1711.c
+ M /trunk-1.8/ui/gtk/main_menubar.c
+ M /trunk-1.8/wiretap/pcapng.c
-------------------------------------------------------------------------
-r43885 | pascal | 2012-07-21 03:13:53 -0700 (Sat, 21 Jul 2012) | 10 lines
-Changed paths:
- M /trunk-1.8/asn1/snmp/snmp.cnf
- M /trunk-1.8/epan/dissectors/packet-snmp.c
+Copy over revisions from the trunk:
-Copy over r43883 from trunk:
+ ------------------------------------------------------------------------
+ r44089 | tuexen | 2012-07-28 04:13:24 -0700 (Sat, 28 Jul 2012) | 4 lines
+ Changed paths:
+ M /trunk/capture.c
-------------------------------------------------------------------------
-r43883 | pascal | 2012-07-21 10:50:32 +0200 (sam. 21 juil. 2012) | 3 lignes
+ Add handling of ringbuffer support when packets are not updated
+ in realtime. This should fix:
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7423
+ ------------------------------------------------------------------------
+ r44091 | pascal | 2012-07-28 06:40:11 -0700 (Sat, 28 Jul 2012) | 2 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-gtp.c
+ M /trunk/epan/dissectors/packet-gtpv2.c
-Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7508 :
-Display snmp.contextName as FT_STRING
+ Fix inverted dissection of Pre-emption Capability and Pre-emption Vulnerability
+ ------------------------------------------------------------------------
+ r44103 | alagoutte | 2012-07-29 07:51:43 -0700 (Sun, 29 Jul 2012) | 4 lines
+ Changed paths:
+ M /trunk/ui/gtk/main_menubar.c
-------------------------------------------------------------------------
+ It is link Tshark Help not Wireshark (already in bottom !)
-------------------------------------------------------------------------
-r43903 | guy | 2012-07-21 18:29:09 -0700 (Sat, 21 Jul 2012) | 19 lines
-Changed paths:
- M /trunk-1.8/epan/dissectors/packet-reload-framing.c
+ #BACKPORT
+ ------------------------------------------------------------------------
+ r44114 | wmeier | 2012-07-29 12:47:50 -0700 (Sun, 29 Jul 2012) | 6 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-mpls-y1711.c
-Copy over revision from trunk:
+ Don't do 'return 0' in mpls-y1722 dissector (so mpls dissector won't try to continue dissecting).
+ See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6787
+ Comments 14, 16, 17
------------------------------------------------------------------------
- r43901 | eapache | 2012-07-21 12:18:12 -0700 (Sat, 21 Jul 2012) | 6 lines
+ r44141 | tuexen | 2012-07-30 13:53:42 -0700 (Mon, 30 Jul 2012) | 4 lines
+ Changed paths:
+ M /trunk/wiretap/pcapng.c
- Fix mis-allocated key size as caught by valgrind.
+ Avoid a division by zero due to overflow.
+ This should fix the crash in
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7266
+ ------------------------------------------------------------------------
+ r44283 | gerald | 2012-08-06 11:24:21 -0700 (Mon, 06 Aug 2012) | 4 lines
+ Changed paths:
+ M /trunk/capture.c
- We have to divide the 'length' field to work with guint32 pointer arithmetic,
- but we still want to allocate and memcpy the original length value, since
- both of those operate in raw bytes, not blocks of sizeof(guint32).
+ Don't call main_window_update() from capture_input_new_packets()
+ on Windows. Otherwise we end up looping forever on a NULL event in
+ main_window_update().
+ ------------------------------------------------------------------------
+ r44287 | jake | 2012-08-06 14:45:43 -0700 (Mon, 06 Aug 2012) | 4 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-dns.c
+ Fix for bug 7555:
+ Add an expert item on the AD bit in a DNS query.
+ Also add some type values.
------------------------------------------------------------------------
- r43898 | eapache | 2012-07-21 09:10:16 -0700 (Sat, 21 Jul 2012) | 5 lines
- The se_tree_* functions are destructive to the key, so save and restore
- the key around each call.
- Fixes part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7509
+Update the release notes.
------------------------------------------------------------------------
-r43904 | guy | 2012-07-21 18:33:42 -0700 (Sat, 21 Jul 2012) | 7 lines
+r44431 | gerald | 2012-08-10 10:59:51 -0700 (Fri, 10 Aug 2012) | 36 lines
Changed paths:
- M /trunk-1.8/epan/dissectors/packet-beep.c
- M /trunk-1.8/epan/dissectors/packet-xmpp.c
- M /trunk-1.8/epan/dissectors/packet-zrtp.c
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-erf.c
-Copy over r43747 from trunk:
+Copy over r44377 with manual intervention:
------------------------------------------------------------------------
- r43747 | darkjames | 2012-07-16 05:09:19 -0700 (Mon, 16 Jul 2012) | 2 lines
+ r44377 | morriss | 2012-08-09 06:20:39 -0700 (Thu, 09 Aug 2012) | 12 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-erf.c
- proto_tree_add_boolean() takes value not ENC_ flag.
+ From Stephen Donnelly: a better fix for the fuzz failure reported in
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
-------------------------------------------------------------------------
-r43905 | guy | 2012-07-21 18:38:16 -0700 (Sat, 21 Jul 2012) | 12 lines
-Changed paths:
- M /trunk-1.8/epan/dissectors/packet-xmpp-utils.c
+ Previous patch solved the reported problem. This patch should cover input
+ validation for the VC Id and Link Rate fields properly.
+
+ Note link_rate==0 (unknown) is supported, as some hardware/firmware may not set
+ this field, but vc_size==0 is defined invalid.
-Copy over r43899 from trunk:
+ From me: also initialize m_sdh_line_rate when the input is garbage.
------------------------------------------------------------------------
- r43899 | eapache | 2012-07-21 09:29:48 -0700 (Sat, 21 Jul 2012) | 8 lines
- Don't throw an assertion if we can't find certain XMPP attributes when
- trying to track sessions for iq, jabber, et al. Just return, so we can
- dissect whatever attributes we can find. An expert info already gets added
- later on.
- The other part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7509
+Copy over r44419 from the trunk:
-------------------------------------------------------------------------
-r43906 | guy | 2012-07-21 19:16:45 -0700 (Sat, 21 Jul 2012) | 8 lines
-Changed paths:
- M /trunk-1.8/epan/dissectors/packet-dcerpc-spoolss.c
+ ------------------------------------------------------------------------
+ r44419 | morriss | 2012-08-10 06:00:20 -0700 (Fri, 10 Aug 2012) | 4 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-erf.c
-Copy over r43724 from trunk:
+ From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
+ Remove another invalid array write.
------------------------------------------------------------------------
- r43724 | pascal | 2012-07-15 08:26:57 -0700 (Sun, 15 Jul 2012) | 3 lines
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7479 :
- Provide an empty string when data pointer is not NULL (regression introduced in r43703)
+
+Update the release notes.
------------------------------------------------------------------------
-r43912 | gerald | 2012-07-22 07:34:08 -0700 (Sun, 22 Jul 2012) | 1 line
+r44452 | gerald | 2012-08-12 07:34:01 -0700 (Sun, 12 Aug 2012) | 1 line
Changed paths:
M /trunk-1.8/epan/enterprise-numbers
M /trunk-1.8/manuf
M /trunk-1.8/services
-[Automatic manuf, services and enterprise-numbers update for 2012-07-22]
+[Automatic manuf, services and enterprise-numbers update for 2012-08-12]
------------------------------------------------------------------------
-r43932 | gerald | 2012-07-23 09:16:03 -0700 (Mon, 23 Jul 2012) | 25 lines
+r44503 | gerald | 2012-08-14 14:01:09 -0700 (Tue, 14 Aug 2012) | 2 lines
Changed paths:
M /trunk-1.8/docbook/release-notes.xml
- M /trunk-1.8/epan/dissectors/packet-bacapp.c
- M /trunk-1.8/epan/dissectors/packet-ethertype.c
- M /trunk-1.8/epan/etypes.h
+
+Add CVE IDs.
+
+------------------------------------------------------------------------
+r44506 | gerald | 2012-08-14 14:39:49 -0700 (Tue, 14 Aug 2012) | 30 lines
+Changed paths:
+ M /trunk-1.8/docbook/release-notes.xml
+ M /trunk-1.8/epan/dissectors/packet-ajp13.c
+ M /trunk-1.8/epan/dissectors/packet-btl2cap.c
+ M /trunk-1.8/epan/dissectors/packet-fclctl.c
+ M /trunk-1.8/epan/dissectors/packet-lisp.c
+ M /trunk-1.8/epan/dissectors/packet-sctp.c
+ M /trunk-1.8/epan/sctpppids.h
Copy over revisions from the trunk:
------------------------------------------------------------------------
- r43850 | jake | 2012-07-19 23:26:35 -0700 (Thu, 19 Jul 2012) | 2 lines
+ r44476 | gerald | 2012-08-13 12:30:42 -0700 (Mon, 13 Aug 2012) | 3 lines
Changed paths:
- M /trunk/epan/dissectors/packet-ethertype.c
- M /trunk/epan/etypes.h
+ M /trunk/epan/dissectors/packet-btl2cap.c
- Add some relevant ethertypes.
+ Add length checks to make sure we don't underflow an integer. Make
+ sure we allocate and copy the same amount of data. Fixes bug 7621.
------------------------------------------------------------------------
- r43868 | wmeier | 2012-07-20 12:09:05 -0700 (Fri, 20 Jul 2012) | 7 lines
+ r44491 | mmann | 2012-08-14 09:29:38 -0700 (Tue, 14 Aug 2012) | 1 line
Changed paths:
- M /trunk/epan/dissectors/packet-bacapp.c
+ M /trunk/epan/dissectors/packet-ajp13.c
+ M /trunk/epan/dissectors/packet-fclctl.c
+ M /trunk/epan/dissectors/packet-lisp.c
- From Lori Tribble:
- Attached is a patch which corrects the string construction issue in the
- PropertyStates method. This patch also corrects a spelling error for
- 'utcTimeSyncronization' and adds decode support for this property.
+ fix subtle g_strdup_printf() memory leaks with ephemeral memory
+ ------------------------------------------------------------------------
+ r44500 | tuexen | 2012-08-14 13:31:49 -0700 (Tue, 14 Aug 2012) | 3 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-sctp.c
+ M /trunk/epan/sctpppids.h
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6475#c8
+ Update SCTP PPIDs.
+ This also fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7635
------------------------------------------------------------------------
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/Makefile.nmake
^
|
| @@ -1,7 +1,7 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake 43429 2012-06-21 17:37:00Z gerald $
+# $Id: Makefile.nmake 44086 2012-07-27 23:30:58Z gerald $
# We "Deploy using XCopy," which is described at
# http://msdn.microsoft.com/en-us/library/ms235291.aspx
@@ -1013,9 +1013,9 @@
xcopy ".\wsutil\libwsutil.dll" $(INSTALL_DIR) /d
if exist ".\wsutil\libwsutil.lib" xcopy ".\wsutil\libwsutil.lib" $(INSTALL_DIR) /d
if exist ".\wsutil\libwsutil.pdb" xcopy ".\wsutil\libwsutil.pdb" $(INSTALL_DIR) /d
- if exist wireshark.exe copy wireshark.exe $(INSTALL_DIR)\wireshark.exe
- if exist wireshark.pdb copy wireshark.pdb $(INSTALL_DIR)\wireshark.pdb
- if exist wireshark.bsc copy wireshark.bsc $(INSTALL_DIR)\wireshark.bsc
+ if exist wireshark.exe xcopy wireshark.exe $(INSTALL_DIR) /d
+ if exist wireshark.pdb xcopy wireshark.pdb $(INSTALL_DIR) /d
+ if exist wireshark.bsc xcopy wireshark.bsc $(INSTALL_DIR) /d
if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL_DIR) /d
if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d
if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/NEWS
^
|
| @@ -1,4 +1,4 @@
-Wireshark 1.8.1 Release Notes
+Wireshark 1.8.2 Release Notes
------------------------------------------------------------------
@@ -14,41 +14,165 @@
The following vulnerabilities have been fixed.
- o wnpa-sec-2012-11
+ o wnpa-sec-2012-13
- The PPP dissector could crash. (Debian bug 680056) -->
+ The DCP ETSI dissector could trigger a zero division. Reported
+ by Laurent Butti. (Bug 7566)
- Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0.
+ Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
+ 1.8.1.
- o wnpa-sec-2012-12
+ CVE-2012-4285
- The NFS dissector could use excessive amounts of CPU. (Bug
- 7436)
+ o wnpa-sec-2012-14
- Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0.
+ The MongoDB dissector could go into a large loop. Reported by
+ Ben Schmidt. (Bug 7572)
+
+ Versions affected: 1.8.0 to 1.8.1.
+
+ CVE-2012-4287
+
+ o wnpa-sec-2012-15
+
+ The XTP dissector could go into an infinite loop. Reported by
+ Ben Schmidt. (Bug 7571)
+
+ Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
+ 1.8.1.
+
+ CVE-2012-4288
+
+ o wnpa-sec-2012-16
+
+ The ERF dissector could overflow a buffer. Reported by Laurent
+ Butti. (Bug 7563)
+
+ Versions affected: 1.8.0 to 1.8.1.
+
+ CVE-2012-4294 CVE-2012-4295
+
+ o wnpa-sec-2012-17
+
+ The AFP dissector could go into a large loop. Reported by
+ Stefan Cornelius. (Bug 7603)
+
+ Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
+ 1.8.1.
+
+ CVE-2012-4289
+
+ o wnpa-sec-2012-18
+
+ The RTPS2 dissector could overflow a buffer. Reported by
+ Laurent Butti. (Bug 7568)
+
+ Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
+ 1.8.1.
+
+ CVE-2012-4296
+
+ o wnpa-sec-2012-19
+
+ The GSM RLC MAC dissector could overflow a buffer. Reported by
+ Laurent Butti. (Bug 7561)
+
+ Versions affected: 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.
+
+ CVE-2012-4297
+
+ o wnpa-sec-2012-20
+
+ The CIP dissector could exhaust system memory. Reported by Ben
+ Schmidt. (Bug 7570)
+
+ Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
+ 1.8.1.
+
+ CVE-2012-4291
+
+ o wnpa-sec-2012-21
+
+ The STUN dissector could crash. Reported by Laurent Butti.
+ (Bug 7569)
+
+ Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
+ 1.8.1.
+
+ CVE-2012-4292
+
+ o wnpa-sec-2012-22
+
+ The EtherCAT Mailbox dissector could abort. Reported by
+ Laurent Butti. (Bug 7562)
+
+ Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
+ 1.8.1.
+
+ CVE-2012-4293
+
+ o wnpa-sec-2012-23
+
+ The CTDB dissector could go into a large loop. Reported by Ben
+ Schmidt. (Bug 7573)
+
+ Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
+ 1.8.1.
+
+ CVE-2012-4290
+
+ o wnpa-sec-2012-24
+
+ The pcap-ng file parser could trigger a zero division. (Bug
+ 7533)
+
+ Versions affected: 1.8.0 to 1.8.1.
+
+ CVE-2012-4286
+
+ o wnpa-sec-2012-25
+
+ The Ixia IxVeriWave file parser could overflow a buffer. (Bug
+ 7533)
+
+ Versions affected: 1.8.0 to 1.8.1.
+
+ CVE-2012-4298
The following bugs have been fixed:
- o Wireshark crashes on bootp filter. (Bug 7391)
+ o Move Y.1711 out of MPLS dissector. (Bug 6787)
+
+ o Patch: Add frame.interface_id support for ERF file format.
+ (Bug 7266)
+
+ o Freeze when Resizing or Moving while capturing. (Bug 7305)
+
+ o Wireshark crashes when using multiple files. (Bug 7423)
+
+ o Wireshark crashes on opening very short NFS pcap file. (Bug
+ 7498)
+
+ o Analyze->Apply as Filter and Analyze->Prepare a Filter cause
+ crashes. (Bug 7506)
- o Wireshark > 1.4 does not correctly read Association ID for PS
- Poll packets. (Bug 7429)
+ o crashes in interface list, pipe handling. (Bug 7511)
- o Radius-EAP broken since 1.8.0 release. (Bug 7430)
+ o ISDN LAPD X.31 packet traffic can not be decoded. (Bug 7514)
- o SNMP incorrectly marks SNMPv3 "discovery" packet as malformed.
- (Bug 7438)
+ o GIOP request_id used for sub dissectors is not assigned when
+ decoding GIOP 1.2 Request message. (Bug 7516)
- o Widgets are not properly expanded in GTK3. (Bug 7377)
+ o pcap-ng -ISB always writes 0 for isb_ifrecv option. (Bug 7523)
- o Find Next Mark duplicated on Edit Menu. (Bug 7445)
+ o GSM classmark3 decode wrong. (Bug 7524)
- o DVB-CI/CI+: fix offset error in operator_info apdu. (Bug 7468)
+ o mem corruption\heap corruption\div0 bugs. (Bug 7533)
- o Unable to correctly identify IEC 61850 MMS packets. (Bug 7488)
+ o DNS AD flag not shown properly. (Bug 7555)
- o WinPcap doesn't install if vcredist_x64 requires reboot. (Bug
- 7507)
+ o Wireshark and TShark crash at start with invalid color filter
+ on SPARC. (Bug 7634)
New and Updated Features
@@ -60,12 +184,14 @@
Updated Protocol Support
- BACapp, BOOTP, DCERPC SPOOLSS, DVB-CI, H.248, IEEE 802.11,
- Jmirror, NAS EPS, NFS, PPP, RELOAD Framing, SES, SNMP, XMPP
+ AFP, Apache JServ Protocol v1.3, Bluetooth L2CAP, CIP, CTDB, DCP
+ ETSI, ERF, EtherCAT Mailbox, FC Link Control, GIOP, GSM A, GSM RLC
+ MAC, GTP, GTPv2, ISDN, LISP, MongoDB, MPLS ITU-T Y.1711 OAM, MPLS
+ PM, NFS, RTPS2, SCTP, STUN, XTP
New and Updated Capture File Support
- Microsoft Network Monitor
+ Ixia IxVeriWave, pcap-ng
Getting Wireshark
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/capture.c
^
|
| @@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture
*
- * $Id: capture.c 42658 2012-05-16 16:29:12Z gerald $
+ * $Id: capture.c 44430 2012-08-10 17:51:09Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -338,9 +338,13 @@
/* we start a new capture file, close the old one (if we had one before). */
/* (we can only have an open capture file in real_time_mode!) */
if( ((capture_file *) capture_opts->cf)->state != FILE_CLOSED) {
- capture_callback_invoke(capture_cb_capture_update_finished, capture_opts);
- cf_finish_tail(capture_opts->cf, &err);
- cf_close(capture_opts->cf);
+ if(capture_opts->real_time_mode) {
+ capture_callback_invoke(capture_cb_capture_update_finished, capture_opts);
+ cf_finish_tail(capture_opts->cf, &err);
+ cf_close(capture_opts->cf);
+ } else {
+ capture_callback_invoke(capture_cb_capture_fixed_finished, capture_opts);
+ }
}
g_free(capture_opts->save_file);
is_tempfile = FALSE;
@@ -367,6 +371,8 @@
capture_opts->save_file = NULL;
return FALSE;
}
+ } else {
+ capture_callback_invoke(capture_cb_capture_prepared, capture_opts);
}
if(capture_opts->show_info) {
@@ -424,7 +430,10 @@
}
/* update the main window so we get events (e.g. from the stop toolbar button) */
+ /* This causes a hang on Windows (see bug 7305). Do we need this on any platform? */
+#ifndef _WIN32
main_window_update();
+#endif
if(capture_opts->show_info)
capture_info_new_packets(to_read);
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/capture_opts.c
^
|
| @@ -1,7 +1,7 @@
/* capture_opts.c
* Routines for capture options setting
*
- * $Id: capture_opts.c 42208 2012-04-23 13:47:45Z ruengeler $
+ * $Id: capture_opts.c 44519 2012-08-15 15:36:29Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -142,9 +142,9 @@
interface_options interface_opts;
interface_opts = g_array_index(capture_opts->ifaces, interface_options, i);
- g_log(log_domain, log_level, "Interface name[%02d] : %s", i, interface_opts.name);
- g_log(log_domain, log_level, "Interface Descr[%02d] : %s", i, interface_opts.descr);
- g_log(log_domain, log_level, "Capture filter[%02d] : %s", i, interface_opts.cfilter);
+ g_log(log_domain, log_level, "Interface name[%02d] : %s", i, interface_opts.name ? interface_opts.name : "(unspecified)");
+ g_log(log_domain, log_level, "Interface Descr[%02d] : %s", i, interface_opts.descr ? interface_opts.descr : "(unspecified)");
+ g_log(log_domain, log_level, "Capture filter[%02d] : %s", i, interface_opts.cfilter ? interface_opts.cfilter : "(unspecified)");
g_log(log_domain, log_level, "Snap length[%02d] (%u) : %d", i, interface_opts.has_snaplen, interface_opts.snaplen);
g_log(log_domain, log_level, "Link Type[%02d] : %d", i, interface_opts.linktype);
g_log(log_domain, log_level, "Promiscuous Mode[%02d]: %s", i, interface_opts.promisc_mode?"TRUE":"FALSE");
@@ -158,15 +158,15 @@
interface_opts.src_type == CAPTURE_IFREMOTE ? "Remote interface" :
"Unknown");
if (interface_opts.src_type == CAPTURE_IFREMOTE) {
- g_log(log_domain, log_level, "Remote host[%02d] : %s", i, interface_opts.remote_host);
- g_log(log_domain, log_level, "Remote port[%02d] : %s", i, interface_opts.remote_port);
+ g_log(log_domain, log_level, "Remote host[%02d] : %s", i, interface_opts.remote_host ? interface_opts.remote_host : "(unspecified)");
+ g_log(log_domain, log_level, "Remote port[%02d] : %s", i, interface_opts.remote_port ? interface_opts.remote_port : "(unspecified)");
}
g_log(log_domain, log_level, "Authentication[%02d] : %s", i,
interface_opts.auth_type == CAPTURE_AUTH_NULL ? "Null" :
interface_opts.auth_type == CAPTURE_AUTH_PWD ? "By username/password" :
"Unknown");
if (interface_opts.auth_type == CAPTURE_AUTH_PWD) {
- g_log(log_domain, log_level, "Auth username[%02d] : %s", i, interface_opts.auth_username);
+ g_log(log_domain, log_level, "Auth username[%02d] : %s", i, interface_opts.auth_username ? interface_opts.auth_username : "(unspecified)");
g_log(log_domain, log_level, "Auth password[%02d] : <hidden>", i);
}
g_log(log_domain, log_level, "UDP data tfer[%02d] : %u", i, interface_opts.datatx_udp);
@@ -178,9 +178,9 @@
g_log(log_domain, log_level, "Sampling param.[%02d] : %d", i, interface_opts.sampling_param);
#endif
}
- g_log(log_domain, log_level, "Interface name[df] : %s", capture_opts->default_options.name);
- g_log(log_domain, log_level, "Interface Descr[df] : %s", capture_opts->default_options.descr);
- g_log(log_domain, log_level, "Capture filter[df] : %s", capture_opts->default_options.cfilter);
+ g_log(log_domain, log_level, "Interface name[df] : %s", capture_opts->default_options.name ? capture_opts->default_options.name : "(unspecified)");
+ g_log(log_domain, log_level, "Interface Descr[df] : %s", capture_opts->default_options.descr ? capture_opts->default_options.descr : "(unspecified)");
+ g_log(log_domain, log_level, "Capture filter[df] : %s", capture_opts->default_options.cfilter ? capture_opts->default_options.cfilter : "(unspecified)");
g_log(log_domain, log_level, "Snap length[df] (%u) : %d", capture_opts->default_options.has_snaplen, capture_opts->default_options.snaplen);
g_log(log_domain, log_level, "Link Type[df] : %d", capture_opts->default_options.linktype);
g_log(log_domain, log_level, "Promiscuous Mode[df]: %s", capture_opts->default_options.promisc_mode?"TRUE":"FALSE");
@@ -194,15 +194,15 @@
capture_opts->default_options.src_type == CAPTURE_IFREMOTE ? "Remote interface" :
"Unknown");
if (capture_opts->default_options.src_type == CAPTURE_IFREMOTE) {
- g_log(log_domain, log_level, "Remote host[df] : %s", capture_opts->default_options.remote_host);
- g_log(log_domain, log_level, "Remote port[df] : %s", capture_opts->default_options.remote_port);
+ g_log(log_domain, log_level, "Remote host[df] : %s", capture_opts->default_options.remote_host ? capture_opts->default_options.remote_host : "(unspecified)");
+ g_log(log_domain, log_level, "Remote port[df] : %s", capture_opts->default_options.remote_port ? capture_opts->default_options.remote_port : "(unspecified)");
}
g_log(log_domain, log_level, "Authentication[df] : %s",
capture_opts->default_options.auth_type == CAPTURE_AUTH_NULL ? "Null" :
capture_opts->default_options.auth_type == CAPTURE_AUTH_PWD ? "By username/password" :
"Unknown");
if (capture_opts->default_options.auth_type == CAPTURE_AUTH_PWD) {
- g_log(log_domain, log_level, "Auth username[df] : %s", capture_opts->default_options.auth_username);
+ g_log(log_domain, log_level, "Auth username[df] : %s", capture_opts->default_options.auth_username ? capture_opts->default_options.auth_username : "(unspecified)");
g_log(log_domain, log_level, "Auth password[df] : <hidden>");
}
g_log(log_domain, log_level, "UDP data tfer[df] : %u", capture_opts->default_options.datatx_udp);
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/config.nmake
^
|
| @@ -1,4 +1,4 @@
-# $Id: config.nmake 43435 2012-06-21 19:34:13Z gerald $
+# $Id: config.nmake 43951 2012-07-24 00:29:04Z gerald $
# Some more information about the settings in this file can be found in
# the file README.windows and the Developer's Guide (available online).
@@ -13,13 +13,13 @@
##### Versions #####
# The SVN revision of our build. Updated by make-version.pl
-SVN_REVISION=43946
+SVN_REVISION=44520
# The current Wireshark version. Recommended: Leave unchanged.
# Updated by make-version.pl
VERSION_MAJOR=1
VERSION_MINOR=8
-VERSION_MICRO=1
+VERSION_MICRO=2
VERSION_BUILD=$(SVN_REVISION)
# Local build information. Recommended: Unique string for your
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for wireshark 1.8.1.
+# Generated by GNU Autoconf 2.68 for wireshark 1.8.2.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@
# Identity of this package.
PACKAGE_NAME='wireshark'
PACKAGE_TARNAME='wireshark'
-PACKAGE_VERSION='1.8.1'
-PACKAGE_STRING='wireshark 1.8.1'
+PACKAGE_VERSION='1.8.2'
+PACKAGE_STRING='wireshark 1.8.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1506,7 +1506,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wireshark 1.8.1 to adapt to many kinds of systems.
+\`configure' configures wireshark 1.8.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1577,7 +1577,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wireshark 1.8.1:";;
+ short | recursive ) echo "Configuration of wireshark 1.8.2:";;
esac
cat <<\_ACEOF
@@ -1771,7 +1771,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wireshark configure 1.8.1
+wireshark configure 1.8.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2311,7 +2311,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wireshark $as_me 1.8.1, which was
+It was created by wireshark $as_me 1.8.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3090,7 +3090,7 @@
# Define the identity of the package.
PACKAGE='wireshark'
- VERSION='1.8.1'
+ VERSION='1.8.2'
cat >>confdefs.h <<_ACEOF
@@ -29050,7 +29050,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wireshark $as_me 1.8.1, which was
+This file was extended by wireshark $as_me 1.8.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -29116,7 +29116,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-wireshark config.status 1.8.1
+wireshark config.status 1.8.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/configure.in
^
|
| @@ -1,8 +1,8 @@
-# $Id: configure.in 43435 2012-06-21 19:34:13Z gerald $
+# $Id: configure.in 43951 2012-07-24 00:29:04Z gerald $
#
AC_PREREQ(2.60)
-AC_INIT(wireshark, 1.8.1)
+AC_INIT(wireshark, 1.8.2)
dnl Check for CPU / vendor / OS
dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/debian/changelog
^
|
| @@ -1,4 +1,4 @@
-wireshark (1.8.1) unstable; urgency=low
+wireshark (1.8.2) unstable; urgency=low
* Self-made package
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/debian/wireshark-common.files
^
|
| @@ -5,9 +5,9 @@
/usr/bin/text2pcap
/usr/bin/rawshark
/usr/lib/wireshark/libwireshark.so.2
-/usr/lib/wireshark/libwireshark.so.2.0.1
+/usr/lib/wireshark/libwireshark.so.2.0.2
/usr/lib/wireshark/libwiretap.so.2
-/usr/lib/wireshark/libwiretap.so.2.0.1
+/usr/lib/wireshark/libwiretap.so.2.0.2
/usr/lib/wireshark/libwsutil.so.2
/usr/lib/wireshark/libwsutil.so.2.0.0
/usr/lib/wireshark/plugins/*
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/diameter/Ericsson.xml
^
|
| @@ -1,56 +1,198 @@
<?xml version="1.0" encoding="UTF-8"?>
- <application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
- <!-- *********** Last updated 2007-04-12 ************ -->
- <avp name="Acc-Service-Type" code="261" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="Enumerated"/>
- <enum name="Audio Conference" code="0"/>
- <enum name="Video Conference" code="1"/>
- </avp>
- <avp name="Rule-Space-Suggestion" code="290" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="UTF8String"/>
- </avp>
- <avp name="Rule-Space-Decision" code="291" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="UTF8String"/>
- </avp>
- <avp name="Bearer-Control-Options" code="292" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="Unsigned32"/>
- </avp>
- <avp name="Charging-Rule-Authorization" code="1055" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <grouped>
- <gavp name="Authorization-State"/>
- <gavp name="Authorization-State-Change-Time"/>
- <gavp name="Next-Authorization-State"/>
- </grouped>
- </avp>
- <avp name="Authorization-State" code="1056" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="Enumerated"/>
- <enum name="Authorized" code="0"/>
- <enum name="Unauthorized due to calendar time" code="1"/>
- <enum name="Unauthorized due to roaming" code="2"/>
- <enum name="Unauthorized due to QoS" code="3"/>
- <enum name="Unauthorized due to blacklisting" code="4"/>
- <enum name="Unauthorized due to terminal limitations" code="5"/>
- <enum name="Unauthorized due to user defined reason 1" code="6"/>
- <enum name="Unauthorized due to user defined reason 2" code="7"/>
- <enum name="Unauthorized due to user defined reason 3" code="8"/>
- <enum name="Unauthorized due to user defined reason 4" code="9"/>
- <enum name="Unauthorized due to user defined reason 5" code="10"/>
- <enum name="Unauthorized due to unknown reason" code="11"/>
- <enum name="Unauthorized due to Usage Reporting over Gx" code="12"/>
- </avp>
- <avp name="Authorization-State-Change-Time" code="1057" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="OctetString"/>
- </avp>
- <avp name="Next-Authorization-State" code="1059" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="Enumerated"/>
- <enum name="Authorized" code="0"/>
- <enum name="Unauthorized due to calendar time" code="0"/>
- </avp>
- <avp name="Gx-Capability-List" code="1060" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="Unsigned32"/>
- </avp>
- <avp name="Customer-Id" code="1146" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
- <type type-name="UTF8String"/>
- </avp>
- </application>
+<application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
+<!-- *********** Last updated 2007-04-12 ************ -->
+ <avp name="Acc-Service-Type" code="261" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="Enumerated"/>
+ <enum name="Audio Conference" code="0"/>
+ <enum name="Video Conference" code="1"/>
+ </avp>
+ <avp name="Rule-Space-Suggestion" code="290" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="UTF8String"/>
+ </avp>
+ <avp name="Rule-Space-Decision" code="291" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="UTF8String"/>
+ </avp>
+ <avp name="Bearer-Control-Options" code="292" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="Unsigned32"/>
+ </avp>
+
+ <!-- ************************** SCAP AVPS, see 155 19-FAY 112 51/2 rev B ********************* -->
+ <avp name="Currency-Code" code="544" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="Subscription-Id" code="553" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <grouped>
+ <gavp name="Subscription-Id-Data"/>
+ <gavp name="Subscription-Id-Type"/>
+ </grouped>
+ </avp>
+ <avp name="Subscription-Id-Data" code="554" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="UTF8String"/>
+ </avp>
+ <avp name="Subscription-Id-Type" code="555" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned32"/>
+ <enum name="End User MSISDN" code="0"/>
+ <enum name="End User IMSI" code="1"/>
+ <enum name="End User SIP URL" code="2"/>
+ <enum name="End User NAI" code="3"/>
+ <enum name="End User PRIVATE (operator defined)" code="4"/>
+ </avp>
+ <avp name="Original-Subscription-Id" code="559" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <grouped>
+ <gavp name="Subscription-Id-Data"/>
+ <gavp name="Subscription-Id-Type"/>
+ </grouped>
+ </avp>
+
+ <avp name="Abnormal-Termination-Reason" code="600" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned32"/>
+ <enum name="Service Element Termination" code="0"/>
+ <enum name="Connection to User Broken" code="1"/>
+ </avp>
+ <avp name="Final-Unit-Indication" code="601" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="Granted-Service-Unit" code="602" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <grouped>
+ <gavp name="Unit-Type"/>
+ <gavp name="Unit-Value"/>
+ <gavp name="Currency-Code"/>
+ </grouped>
+ </avp>
+ <avp name="Cost" code="603" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Float64"/>
+ </avp>
+ <avp name="Cost-Information" code="604" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <grouped>
+ <gavp name="Cost"/>
+ <gavp name="Currency-Code"/>
+ </grouped>
+ </avp>
+ <avp name="Accounting-Correlation-Id" code="605" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="UTF8String"/>
+ </avp>
+
+ <avp name="Requested-Service-Unit" code="606" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <grouped>
+ <gavp name="Unit-Type"/>
+ <gavp name="Unit-Value"/>
+ <gavp name="Currency-Code"/>
+ </grouped>
+ </avp>
+ <avp name="Service-Parameter-Info" code="607" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <grouped>
+ <gavp name="Service-Parameter-Type"/>
+ <gavp name="Service-Parameter-Value"/>
+ </grouped>
+ </avp>
+ <avp name="Service-Parameter-Type" code="608" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned32"/>
+ <!-- CCN Specific Interpretation, see 1553-HSD 108 06/1 rev A -->
+ <enum name="Service Provider Id (CCN)" code="0"/>
+ <enum name="Extension Number 1 (CCN)" code="1"/>
+ <enum name="Extension Number 2 (CCN)" code="2"/>
+ <enum name="Extension Number 3 (CCN)" code="3"/>
+ <enum name="Extension Number 4 (CCN)" code="4"/>
+ <enum name="Extension Text (CCN)" code="5"/>
+ <enum name="GPRS Quality of Service (CCN)" code="6"/>
+ <enum name="Redirecting Party Number (CCN)" code="7"/>
+ <enum name="Originating Location Information (CCN)" code="8"/>
+ <enum name="Terminating Location Information (CCN)" code="9"/>
+ <enum name="Region Charging Origin (CCN)" code="10"/>
+ <enum name="Subscription Type (CCN)" code="11"/>
+ <enum name="SMS Delivery Status (CCN)" code="12"/>
+ <enum name="Time Zone (CCN)" code="13"/>
+ <enum name="Traffic Case (CCN)" code="14"/>
+ <enum name="Dedicated Account Id (CCN)" code="15"/>
+ <enum name="Calling Party Number (CCN)" code="16"/>
+ <enum name="Called Party Number (CCN)" code="17"/>
+ <enum name="Tele Service Code (CCN)" code="18"/>
+ <enum name="Service Key (CCN)" code="19"/>
+ </avp>
+ <avp name="Service-Parameter-Value" code="609" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Event-Timestamp" code="610" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Time"/>
+ </avp>
+ <avp name="Unit-Type" code="611" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned32"/>
+ <enum name="Service Credit Time (seconds)" code="0"/>
+ <enum name="Service Credit Volume (bytes)" code="1"/>
+ <enum name="Service Credit Events (number of events)" code="2"/>
+ <enum name="Serivce Credit Money (monetary value)" code="3"/>
+ </avp>
+ <avp name="Unit-Value" code="612" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <grouped>
+ <gavp name="Value-Digits"/>
+ <gavp name="Exponent"/>
+ </grouped>
+ </avp>
+ <avp name="Used-Service-Unit" code="613" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <grouped>
+ <gavp name="Unit-Type"/>
+ <gavp name="Unit-Value"/>
+ <gavp name="Currency-Code"/>
+ </grouped>
+ </avp>
+ <avp name="Check-Balance-Result" code="614" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned32"/>
+ <enum name="Enough Credit" code="0"/>
+ <enum name="No Credit" code="1"/>
+ </avp>
+ <avp name="Requested-Action" code="615" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned32"/>
+ <enum name="Direct Debiting" code="0"/>
+ <enum name="Refund Account" code="1"/>
+ <enum name="Check Balance" code="2"/>
+ <enum name="Price Enquiry" code="3"/>
+ </avp>
+ <avp name="Exponent" code="616" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Value-Digits" code="617" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+ <type type-name="Unsigned64"/>
+ </avp>
+ <!-- ************************ END SCAP AVPS ******************* -->
+
+
+ <avp name="Charging-Rule-Authorization" code="1055" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <grouped>
+ <gavp name="Authorization-State"/>
+ <gavp name="Authorization-State-Change-Time"/>
+ <gavp name="Next-Authorization-State"/>
+ </grouped>
+ </avp>
+ <avp name="Authorization-State" code="1056" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="Enumerated"/>
+ <enum name="Authorized" code="0"/>
+ <enum name="Unauthorized due to calendar time" code="1"/>
+ <enum name="Unauthorized due to roaming" code="2"/>
+ <enum name="Unauthorized due to QoS" code="3"/>
+ <enum name="Unauthorized due to blacklisting" code="4"/>
+ <enum name="Unauthorized due to terminal limitations" code="5"/>
+ <enum name="Unauthorized due to user defined reason 1" code="6"/>
+ <enum name="Unauthorized due to user defined reason 2" code="7"/>
+ <enum name="Unauthorized due to user defined reason 3" code="8"/>
+ <enum name="Unauthorized due to user defined reason 4" code="9"/>
+ <enum name="Unauthorized due to user defined reason 5" code="10"/>
+ <enum name="Unauthorized due to unknown reason" code="11"/>
+ <enum name="Unauthorized due to Usage Reporting over Gx" code="12"/>
+ </avp>
+ <avp name="Authorization-State-Change-Time" code="1057" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Next-Authorization-State" code="1059" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="Enumerated"/>
+ <enum name="Authorized" code="0"/>
+ <enum name="Unauthorized due to calendar time" code="0"/>
+ </avp>
+ <avp name="Gx-Capability-List" code="1060" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="Customer-Id" code="1146" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+ <type type-name="UTF8String"/>
+ </avp>
+
+</application>
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/diameter/dictionary.xml
^
|
| @@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: dictionary.xml 43161 2012-06-08 19:23:35Z morriss $ -->
+<!-- $Id: dictionary.xml 44396 2012-08-09 19:20:18Z morriss $ -->
<?type-proto key="MIPRegistrationRequest" value="mip" ?>
<?avp-proto key="Example-AVP" value="data" ?>
@@ -145,6 +145,7 @@
<command name="3GPP-Provide-Location" code="8388620" vendor-id="None"/> <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
<command name="3GPP-Location-Report" code="8388621" vendor-id="None"/> <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
<command name="3GPP-LCS-Routing-Info" code="8388622" vendor-id="None"/> <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
+
<!--
8388623 Notif-Request/Answer (NFR/NFA) [Tomas_Menzl]
8388624 Msg-Interface-Request/Answer (MIFR/MIFA) [Tomas_Menzl]
@@ -154,14 +155,19 @@
8388628 Juniper-Sync-Event (JSE) [Aleksey_Romanov]
8388629 Juniper-Session-Discovery (JSD) [Aleksey_Romanov]
8388630 Query Profile Request Answer (QPR/QPA) [3GPP2 publication X.S0057A E-UTRAN eHRPD7][Avi_Lior]
-
-->
+
<command name="Subscription Information Application" code="8388631" vendor-id="None"/>
<command name="Distributed Charging" code="8388632" vendor-id="None"/>
<command name="Ericsson-SL" code="8388633" vendor-id="None"/> <!-- Ericsson Spending Limit -->
<command name="Ericsson-SN" code="8388634" vendor-id="None"/> <!-- Ericsson Spending Status Notification -->
+ <command name="Spending-Limit" code="8388635" vendor-id="None"/> <!-- TGPP 29.219/Sy -->
+ <command name="Spending-Status-Notification" code="8388636" vendor-id="None"/> <!-- TGPP 29.219/Sy -->
<!--
- 8388623-16777213 Unassigned
+ 8388637 TDF-Session-Request/Answer (TSR/TSA) [3GPP TS 29.212][Kimmo_Kymalainen]
+ 8388638 3GPP-Update-VCSG-Location-Request/Answer (UVR/UVA) [3GPP TS 29.272][Kimmo_Kymalainen]
+
+ 8388629-16777213 Unassigned
16777214 Experimental code [RFC3588]
16777215 Experimental code [RFC3588]
-->
@@ -178,6 +184,7 @@
<vendor vendor-id="Merit" code="61" name="Merit Networks"/>
<vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
<vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
+ <vendor vendor-id="Huawei" code="2011" name="Huawei"/>
<vendor vendor-id="Cisco" code="5771" name="Cisco"/>
<vendor vendor-id="TGPP2" code="5535" name="3GPP2"/>
<vendor vendor-id="TGPP" code="10415" name="3GPP"/>
@@ -1926,6 +1933,12 @@
<enum name="DIAMETER_ERROR_TOO_MUCH_DATA" code="5039"/>
<enum name="DIAMETER_ERROR_NOT SUPPORTED_USER_DATA" code="5040"/>
<enum name="DIAMETER_ERROR_MIP6_AUTH_MODE" code="5041"/>
+
+ <!-- (Ericsson) SCAP Result Codes, see 155 19-FAY 112 51/2 rev B -->
+ <enum name="DIAMETER_END_USER_SERVICE_DENIED" code="4241"/>
+ <enum name="DIAMETER_END_USER_NOT_FOUND" code="5241"/>
+ <!-- END SCAP Result Codes -->
+
<!-- 5042-4294967295 Unassigned -->
</avp>
<avp name="Product-Name" code="269" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
@@ -5057,7 +5070,7 @@
<!--
Note: The AVP codes from 1485 to 1499 are reserved for TS 29.272.
- Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
+ Note: The AVP codes from 1508 to 1599 are reserved for TS 29.273
-->
<avp name="MME-Location-Information" code="1600" vendor-bit="must" vendor-id="TGPP">
@@ -5294,6 +5307,10 @@
<type type-name="Unsigned32"/>
</avp>
+ <avp name="UE-Time-Zone" code="1641" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="UTF8String"/>
+ </avp>
+
<!--
Note: The AVP codes from 1638 to 1699 are reserved for TS 29.272.
-->
@@ -5749,7 +5766,8 @@
32.299 [5]
Note: The AVP codes from 2118 to 2199 are reserved for TS 32.299
- Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215
+ Note: The AVP codes from 2200 to 2299 are reserved for TS 29.215
+ Found in TGPPS9.xml
-->
<avp name="Reserved" code="2300" vendor-bit="must" vendor-id="TGPP">
@@ -5786,9 +5804,11 @@
<enum name="Authenticated" code="0"/>
<enum name="Unauthenticated" code="1"/>
</avp>
+ <avp name="Account-Expiration" code="2309" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="Time"/>
+ </avp>
<!--
- 2309 Account-Expiration Time
2310 AoC-Format Enumerated
2311 AoC-Service Enumerated
2312 AoC-Service-Obligatory-Type Grouped
@@ -5816,6 +5836,30 @@
Note: The AVP codes from 2409 to 2499 are reserved for TS 29.173
-->
+ <avp name="Serving-Node" code="2401" vendor-bit="must" vendor-id="TGPP">
+ <grouped>
+ <gavp name="SGSN-Number"/>
+ <gavp name="MME-Name"/>
+ <gavp name="MME-Realm"/>
+ <gavp name="MSC-Number"/>
+ <gavp name="3GPP-AAA-Server-Name"/>
+ <gavp name="LCS-Capabilities-Sets"/>
+ <gavp name="GMLC-Address"/>
+ </grouped>
+ </avp>
+ <avp name="MME-Name" code="2402" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="DiameterIdentity"/>
+ </avp>
+ <avp name="MSC-Number" code="2403" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="LCS-Capabilities-Sets" code="2304" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="MME-Realm" code="2408" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="DiameterIdentity"/>
+ </avp>
+
<avp name="Location-Type" code="2500" vendor-bit="must" vendor-id="TGPP">
<type type-name="Enumerated"/>
<enum name="CURRENT_LOCATION" code="0"/>
@@ -5881,15 +5925,21 @@
<enum name="NOT_ALLOWED" code="4"/>
</avp>
- <!-- 2513 Accuracy-Fulfilment-Indicator Enumerated -->
+ <avp name="Accuracy-Fulfilment-Indicator" code="2513" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="Enumerated"/>
+ <enum name="REQUESTED_ACCURACY_FULFILLED" code="0"/>
+ <enum name="REQUESTED_ACCURACY_NOT_FULFILLED" code="1"/>
+ </avp>
<avp name="Age-Of-Location-Estimate" code="2514" vendor-bit="must" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
-
- <!-- 2515 Velocity-Estimate OctetString -->
- <!-- 2516 EUTRAN-Positioning-Data OctetString -->
-
+ <avp name="Velocity-Estimate" code="2515" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="EUTRAN-Positioning-Data" code="2516" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="OctetString"/>
+ </avp>
<avp name="ECGI" code="2517" vendor-bit="must" vendor-id="TGPP">
<type type-name="OctetString"/>
</avp>
@@ -5930,6 +5980,21 @@
Note: The AVP codes from 2606 to 2699 are reserved for TS 32.299
-->
+ <avp name="Policy-Counter-Identifier" code="2901" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="UTF8String"/>
+ </avp>
+ <avp name="Policy-Counter-Status" code="2902" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="UTF8String"/>
+ </avp>
+ <avp name="Policy-Counter-Status-Report" code="2903" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="UTF8String"/>
+ </avp>
+ <avp name="SL-Request-Type" code="2904" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="Enumerated"/>
+ <enum name="INITIAL_REQUEST" code="0"/>
+ <enum name="INTERMEDIATE_REQUEST" code="1"/>
+ </avp>
+
<!--- TGPP2 AVP's X.S0013-014-0
http://www.3gcn.org/TGPP2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S0013-014%20v0.3.0%20SBBC%20Ty%20Stage-3.doc
-->
@@ -6044,7 +6109,9 @@
<application id="16777266" name="3GPP Gxx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm"></application>
<application id="16777269" name="Ericsson HSI" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
<application id="16777272" name="3GPP S6b" uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application>
+ <application id="16777291" name="3GPP SLh" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
<application id="16777292" name="3GPP SGmb" uri="http://www.3gpp.org/ftp/Specs/html-info/29061.htm"></application>
+ <application id="16777302" name="3GPP Sy" uri="http://www.3gpp.org/ftp/Specs/html-info/29219.htm"></application>
<application id="16777304" name="Ericsson Sy" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
&nasreq;
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/docbook/release-notes.xml
^
|
| @@ -2,7 +2,7 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!-- $Id: release-notes.xml 43935 2012-07-23 16:46:24Z gerald $ -->
+<!-- $Id: release-notes.xml 44519 2012-08-15 15:36:29Z gerald $ -->
<!--
DOCUMENT SECTION
@@ -12,7 +12,7 @@
<!--
Wireshark Info
-->
-<!ENTITY WiresharkCurrentVersion "1.8.1">
+<!ENTITY WiresharkCurrentVersion "1.8.2">
]>
@@ -36,42 +36,243 @@
<listitem>
<para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-11.html">wnpa-sec-2012-11</ulink>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-13.html">wnpa-sec-2012-13</ulink>
</para>
<para>
- The PPP dissector could crash.
- <!-- Fixed in trunk: r43784 -->
- <!-- Fixed in trunk-1.8: r43839 -->
- <!-- Fixed in trunk-1.6: r43843 -->
- <!-- Fixed in trunk-1.4: r43870 -->
- <!-- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=????">Bug
- ????</ulink>) -->
- (<ulink url="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056">Debian bug
- 680056</ulink>) -->
+ The DCP ETSI dissector could trigger a zero division. Reported by
+ Laurent Butti.
+ <!-- Fixed in trunk: r44247 -->
+ <!-- Fixed in trunk-1.8: r44309 -->
+ <!-- Fixed in trunk-1.6: r44310 -->
+ <!-- Fixed in trunk-1.4: r44311 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7566">Bug
+ 7566</ulink>)
+ </para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4285">CVE-2012-4285</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-14.html">wnpa-sec-2012-14</ulink>
+ </para>
+ <para>
+ The MongoDB dissector could go into a large loop. Reported by Ben
+ Schmidt.
+ <!-- Fixed in trunk: r44288 -->
+ <!-- Fixed in trunk-1.8: r44342 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7572">Bug
+ 7572</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4287">CVE-2012-4287</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-15.html">wnpa-sec-2012-15</ulink>
+ </para>
+ <para>
+ The XTP dissector could go into an infinite loop. Reported by Ben Schmidt.
+ <!-- Fixed in trunk: r44289 -->
+ <!-- Fixed in trunk-1.8: r44343 -->
+ <!-- Fixed in trunk-1.6: r44344 -->
+ <!-- Fixed in trunk-1.4: r44345 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7571">Bug
+ 7571</ulink>)
+ </para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4288">CVE-2012-4288</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-16.html">wnpa-sec-2012-16</ulink>
+ </para>
+ <para>
+ The ERF dissector could overflow a buffer. Reported by Laurent Butti.
+ <!-- Fixed in trunk: r44306, r44377, r44419 -->
+ <!-- Fixed in trunk-1.8: r44347, r44431 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563">Bug
+ 7563</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4294">CVE-2012-4294</ulink>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4295">CVE-2012-4295</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-17.html">wnpa-sec-2012-17</ulink>
+ </para>
+ <para>
+ The AFP dissector could go into a large loop. Reported by Stefan Cornelius.
+ <!-- Fixed in trunk: r44317 -->
+ <!-- Fixed in trunk-1.8: r44349 -->
+ <!-- Fixed in trunk-1.6: r44351 -->
+ <!-- Fixed in trunk-1.4: r44352 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7603">Bug
+ 7603</ulink>)
+ </para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4289">CVE-2012-4289</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-18.html">wnpa-sec-2012-18</ulink>
+ </para>
+ <para>
+ The RTPS2 dissector could overflow a buffer. Reported by Laurent Butti.
+ <!-- Fixed in trunk: r44320 -->
+ <!-- Fixed in trunk-1.8: r44353 -->
+ <!-- Fixed in trunk-1.6: r44354 -->
+ <!-- Fixed in trunk-1.4: r44355 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7568">Bug
+ 7568</ulink>)
+ </para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4296">CVE-2012-4296</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-19.html">wnpa-sec-2012-19</ulink>
+ </para>
+ <para>
+ The GSM RLC MAC dissector could overflow a buffer. Reported by Laurent Butti.
+ <!-- Fixed in trunk: r44307, r44319 -->
+ <!-- Fixed in trunk-1.8: r44356 -->
+ <!-- Fixed in trunk-1.6: r44357 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7561">Bug
+ 7561</ulink>)
+ </para>
+ <para>Versions affected: 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4297">CVE-2012-4297</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-20.html">wnpa-sec-2012-20</ulink>
+ </para>
+ <para>
+ The CIP dissector could exhaust system memory. Reported by Ben Schmidt.
+ <!-- Fixed in trunk: r44312 -->
+ <!-- Fixed in trunk-1.8: r44360 -->
+ <!-- Fixed in trunk-1.6: r44361 -->
+ <!-- Fixed in trunk-1.4: r44362 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7570">Bug
+ 7570</ulink>)
+ </para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4291">CVE-2012-4291</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-21.html">wnpa-sec-2012-21</ulink>
+ </para>
+ <para>
+ The STUN dissector could crash. Reported by Laurent Butti.
+ <!-- Fixed in trunk: r44366 -->
+ <!-- Fixed in trunk-1.8: r44367 -->
+ <!-- Fixed in trunk-1.6: r44368 -->
+ <!-- Fixed in trunk-1.4: r44369 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7569">Bug
+ 7569</ulink>)
+ </para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4292">CVE-2012-4292</ulink>
</para>
- <para>Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0.</para>
- <!-- <para>
- <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-????">CVE-2012-????</ulink>
- </para> -->
</listitem>
<listitem>
<para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-12.html">wnpa-sec-2012-12</ulink>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-22.html">wnpa-sec-2012-22</ulink>
</para>
<para>
- The NFS dissector could use excessive amounts of CPU.
- <!-- Fixed in trunk: r43576 -->
- <!-- Fixed in trunk-1.8: r43840 -->
- <!-- Fixed in trunk-1.6: r43869 -->
- <!-- Fixed in trunk-1.4: r43872 -->
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7436">Bug
- 7436</ulink>)
+ The EtherCAT Mailbox dissector could abort. Reported by Laurent Butti.
+ <!-- Fixed in trunk: r43149 -->
+ <!-- Fixed in trunk-1.8: r44389 -->
+ <!-- Fixed in trunk-1.6: r44391 -->
+ <!-- Fixed in trunk-1.4: r44392 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7562">Bug
+ 7562</ulink>)
+ </para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4293">CVE-2012-4293</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-23.html">wnpa-sec-2012-23</ulink>
+ </para>
+ <para>
+ The CTDB dissector could go into a large loop. Reported by Ben Schmidt.
+ <!-- Fixed in trunk: r44403 -->
+ <!-- Fixed in trunk-1.8: r44404 -->
+ <!-- Fixed in trunk-1.6: r44405 -->
+ <!-- Fixed in trunk-1.4: r44406 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7573">Bug
+ 7573</ulink>)
+ </para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4290">CVE-2012-4290</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-24.html">wnpa-sec-2012-24</ulink>
+ </para>
+ <para>
+ The pcap-ng file parser could trigger a zero division.
+ <!-- Fixed in trunk: r44074 -->
+ <!-- Fixed in trunk-1.8: r44427 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7533">Bug
+ 7533</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4286">CVE-2012-4286</ulink>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-25.html">wnpa-sec-2012-25</ulink>
+ </para>
+ <para>
+ The Ixia IxVeriWave file parser could overflow a buffer.
+ <!-- Fixed in trunk: r44075 -->
+ <!-- Fixed in trunk-1.8: r44428 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7533">Bug
+ 7533</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.1.</para>
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4298">CVE-2012-4298</ulink>
</para>
- <para>Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0.</para>
- <!-- <para>
- <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-????">CVE-2012-????</ulink>
- </para> -->
</listitem>
</itemizedlist>
@@ -95,57 +296,87 @@
-->
<listitem><para>
- Wireshark crashes on bootp filter.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7391">Bug
- 7391</ulink>)
+ Move Y.1711 out of MPLS dissector.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6787">Bug
+ 6787</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Patch: Add frame.interface_id support for ERF file format.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7266">Bug
+ 7266</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Freeze when Resizing or Moving while capturing.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7305">Bug
+ 7305</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Wireshark crashes when using multiple files.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7423">Bug
+ 7423</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Wireshark crashes on opening very short NFS pcap file.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7498">Bug
+ 7498</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Analyze->Apply as Filter and Analyze->Prepare a Filter cause crashes.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7506">Bug
+ 7506</ulink>)
</para></listitem>
<listitem><para>
- Wireshark > 1.4 does not correctly read Association ID for PS Poll packets.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7429">Bug
- 7429</ulink>)
+ crashes in interface list, pipe handling.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7511">Bug
+ 7511</ulink>)
</para></listitem>
<listitem><para>
- Radius-EAP broken since 1.8.0 release.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7430">Bug
- 7430</ulink>)
+ ISDN LAPD X.31 packet traffic can not be decoded.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7514">Bug
+ 7514</ulink>)
</para></listitem>
<listitem><para>
- SNMP incorrectly marks SNMPv3 "discovery" packet as malformed.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438">Bug
- 7438</ulink>)
+ GIOP request_id used for sub dissectors is not assigned when decoding GIOP 1.2 Request message.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7516">Bug
+ 7516</ulink>)
</para></listitem>
<listitem><para>
- Widgets are not properly expanded in GTK3.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7377">Bug
- 7377</ulink>)
+ pcap-ng -ISB always writes 0 for isb_ifrecv option.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7523">Bug
+ 7523</ulink>)
</para></listitem>
<listitem><para>
- Find Next Mark duplicated on Edit Menu.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7445">Bug
- 7445</ulink>)
+ GSM classmark3 decode wrong.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7524">Bug
+ 7524</ulink>)
</para></listitem>
<listitem><para>
- DVB-CI/CI+: fix offset error in operator_info apdu.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7468">Bug
- 7468</ulink>)
+ mem corruption\heap corruption\div0 bugs.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7533">Bug
+ 7533</ulink>)
</para></listitem>
<listitem><para>
- Unable to correctly identify IEC 61850 MMS packets.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7488">Bug
- 7488</ulink>)
+ DNS AD flag not shown properly.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7555">Bug
+ 7555</ulink>)
</para></listitem>
<listitem><para>
- WinPcap doesn't install if vcredist_x64 requires reboot.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7507">Bug
- 7507</ulink>)
+ Wireshark and TShark crash at start with invalid color filter on SPARC.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7634">Bug
+ 7634</ulink>)
</para></listitem>
</itemizedlist>
@@ -174,20 +405,30 @@
<!-- Sort alphabetically -->
-BACapp,
-BOOTP,
-DCERPC SPOOLSS,
-DVB-CI,
-H.248,
-IEEE 802.11,
-Jmirror,
-NAS EPS,
+AFP,
+Apache JServ Protocol v1.3,
+Bluetooth L2CAP,
+CIP,
+CTDB,
+DCP ETSI,
+ERF,
+EtherCAT Mailbox,
+FC Link Control,
+GIOP,
+GSM A,
+GSM RLC MAC,
+GTP,
+GTPv2,
+ISDN,
+LISP,
+MongoDB,
+MPLS ITU-T Y.1711 OAM,
+MPLS PM,
NFS,
-PPP,
-RELOAD Framing,
-SES,
-SNMP,
-XMPP
+RTPS2,
+SCTP,
+STUN,
+XTP
</para>
</section>
@@ -195,7 +436,7 @@
<section id="NewCapture"><title>New and Updated Capture File Support</title>
<para>
-Microsoft Network Monitor
+Ixia IxVeriWave, pcap-ng
</para>
</section>
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/dumpcap.c
^
|
| @@ -1,6 +1,6 @@
/* dumpcap.c
*
- * $Id: dumpcap.c 43502 2012-06-27 05:17:38Z guy $
+ * $Id: dumpcap.c 44410 2012-08-10 00:08:03Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -3784,8 +3784,10 @@
/* We may be called multiple times from pcap_dispatch(); if we've set
the "stop capturing" flag, ignore this packet, as we're not
supposed to be saving any more packets. */
- if (!global_ld.go)
+ if (!global_ld.go) {
+ pcap_opts->dropped++;
return;
+ }
if (global_ld.pdh) {
gboolean successful;
@@ -3801,11 +3803,13 @@
if (!successful) {
global_ld.go = FALSE;
global_ld.err = err;
+ pcap_opts->dropped++;
} else {
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO,
"Wrote a packet of length %d captured on interface %u.",
phdr->caplen, pcap_opts->interface_id);
global_ld.packet_count++;
+ pcap_opts->received++;
/* if the user told us to stop after x packets, do we already have enough? */
if ((global_ld.packet_max > 0) && (global_ld.packet_count >= global_ld.packet_max)) {
global_ld.go = FALSE;
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/Makefile.am
^
|
| @@ -3,7 +3,7 @@
# (EPAN is a historical name; it stands for Ethereal Protocol ANalyzer
# Library)
#
-# $Id: Makefile.am 43435 2012-06-21 19:34:13Z gerald $
+# $Id: Makefile.am 43951 2012-07-24 00:29:04Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -56,7 +56,7 @@
noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
lib_LTLIBRARIES = libwireshark.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwireshark_la_LDFLAGS = -version-info 2:1:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 2:2:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
include Makefile.common
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/Makefile.in
^
|
| @@ -19,7 +19,7 @@
# (EPAN is a historical name; it stands for Ethereal Protocol ANalyzer
# Library)
#
-# $Id: Makefile.am 43435 2012-06-21 19:34:13Z gerald $
+# $Id: Makefile.am 43951 2012-07-24 00:29:04Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -538,7 +538,7 @@
noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
lib_LTLIBRARIES = libwireshark.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwireshark_la_LDFLAGS = -version-info 2:1:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 2:2:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
LIBWIRESHARK_SRC = \
addr_and_mask.c \
addr_resolv.c \
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/column-utils.c
^
|
| @@ -1,7 +1,7 @@
/* column-utils.c
* Routines for column utilities.
*
- * $Id: column-utils.c 41185 2012-02-25 23:24:34Z guy $
+ * $Id: column-utils.c 44409 2012-08-09 23:44:52Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1292,11 +1292,11 @@
col_set_delta_time_dis(fd, cinfo, col);
break;
- case TS_UTC:
+ case COL_UTC_TIME:
col_set_utc_time(fd, cinfo, col);
break;
- case TS_UTC_WITH_DATE:
+ case COL_UTC_DATE_TIME:
col_set_utc_date_time(fd, cinfo, col);
break;
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-afp.c
^
|
| @@ -2,7 +2,7 @@
* Routines for afp packet dissection
* Copyright 2002, Didier Gautheron <dgautheron@magic.fr>
*
- * $Id: packet-afp.c 43066 2012-06-04 13:52:46Z etxrab $
+ * $Id: packet-afp.c 44350 2012-08-08 17:24:27Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -4636,8 +4636,9 @@
return offset;
}
+#define AFP_MAX_ACL_ENTRIES 500 /* Arbitrary. */
static gint
-decode_kauth_acl(tvbuff_t *tvb, proto_tree *tree, gint offset)
+decode_kauth_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
int entries;
int i;
@@ -4652,9 +4653,14 @@
sub_tree = proto_item_add_subtree(item, ett_afp_ace_entries);
offset += 4;
- proto_tree_add_item(tree, hf_afp_acl_flags, tvb, offset, 4, ENC_BIG_ENDIAN);
+ item = proto_tree_add_item(tree, hf_afp_acl_flags, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
+ if (entries > AFP_MAX_ACL_ENTRIES) {
+ expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "Excessive number of ACL entries (%u). Stopping dissection.", entries);
+ THROW(ReportedBoundsError);
+ }
+
for (i = 0; i < entries; i++) {
item = proto_tree_add_text(sub_tree, tvb, offset, 24, "ACE: %u", i);
ace_tree = proto_item_add_subtree(item, ett_afp_ace_entry);
@@ -4666,7 +4672,7 @@
}
static gint
-decode_uuid_acl(tvbuff_t *tvb, proto_tree *tree, gint offset, guint16 bitmap)
+decode_uuid_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, guint16 bitmap)
{
if ((offset & 1))
PAD(1);
@@ -4682,7 +4688,7 @@
}
if ((bitmap & kFileSec_ACL)) {
- offset = decode_kauth_acl(tvb, tree, offset);
+ offset = decode_kauth_acl(tvb, pinfo, tree, offset);
}
return offset;
@@ -4702,7 +4708,7 @@
offset = decode_name(tree, pinfo, tvb, offset);
- offset = decode_uuid_acl(tvb, tree, offset, bitmap);
+ offset = decode_uuid_acl(tvb, pinfo, tree, offset, bitmap);
return offset;
}
@@ -4734,7 +4740,7 @@
bitmap = decode_acl_list_bitmap(tvb, tree, offset);
offset += 2;
- offset = decode_uuid_acl(tvb, tree, offset, bitmap);
+ offset = decode_uuid_acl(tvb, pinfo, tree, offset, bitmap);
return offset;
}
@@ -6516,7 +6522,7 @@
{ &hf_afp_acl_entrycount,
{ "ACEs count", "afp.acl_entrycount",
- FT_UINT32, BASE_HEX, NULL, 0,
+ FT_UINT32, BASE_DEC, NULL, 0,
"Number of ACL entries", HFILL }},
{ &hf_afp_acl_flags,
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-ajp13.c
^
|
| @@ -2,7 +2,7 @@
* Routines for AJP13 dissection
* Copyright 2002, Christopher K. St. John <cks@distributopia.com>
*
- * $Id: packet-ajp13.c 43066 2012-06-04 13:52:46Z etxrab $
+ * $Id: packet-ajp13.c 44506 2012-08-14 21:39:49Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -733,7 +733,7 @@
if (ajp13_tree) {
proto_tree_add_string_format(ajp13_tree, hf_ajp13_req_attribute,
tvb, apos, 1+aname_len+2+aval_len+2,
- g_strdup_printf("%s: %s", aname, aval),
+ ep_strdup_printf("%s: %s", aname, aval),
"%s: %s", aname, aval);
}
} else if (aid == 0x0B ) {
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-btl2cap.c
^
|
| @@ -6,7 +6,7 @@
* Refactored for wireshark checkin
* Ronnie Sahlberg 2006
*
- * $Id: packet-btl2cap.c 41645 2012-03-18 22:24:24Z wmeier $
+ * $Id: packet-btl2cap.c 44506 2012-08-14 21:39:49Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1036,13 +1036,22 @@
sdulen = tvb_get_letohs(tvb, offset);
pi = proto_tree_add_item(btl2cap_tree, hf_btl2cap_sdulength, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- length -= 6; /*Control, SDUlength, FCS*/
+
/* Detect malformed data */
+
+ if (length <= 6) {
+ expert_add_info_format(pinfo, pi, PI_MALFORMED, PI_WARN,
+ "SDU length too short: %u", length);
+ THROW(ReportedBoundsError);
+ }
+
+ length -= 6; /*Control, SDUlength, FCS*/
+
if (sdulen < length) {
sdulen = length;
expert_add_info_format(pinfo, pi, PI_MALFORMED, PI_WARN,
- "SDU length less than length of first packet");
+ "SDU length less than length of first packet (%u < %u)", sdulen, length);
}
if (!pinfo->fd->flags.visited) {
@@ -1051,8 +1060,8 @@
mfp->last_frame = 0;
mfp->tot_len = sdulen;
mfp->reassembled = se_alloc(sdulen);
- tvb_memcpy(tvb, mfp->reassembled, offset, length);
- mfp->cur_off = length;
+ tvb_memcpy(tvb, mfp->reassembled, offset, sdulen);
+ mfp->cur_off = sdulen;
se_tree_insert32(config_data->start_fragments, pinfo->fd->num, mfp);
} else {
mfp = se_tree_lookup32(config_data->start_fragments, pinfo->fd->num);
@@ -1064,6 +1073,11 @@
col_append_fstr(pinfo->cinfo, COL_INFO, "[Reassembled in #%u] ", mfp->last_frame);
}
} else {
+ if (length <= 4) {
+ expert_add_info_format(pinfo, btl2cap_tree, PI_MALFORMED, PI_WARN,
+ "Control / FCS length too short: %u", length);
+ THROW(ReportedBoundsError);
+ }
length -= 4; /*Control, FCS*/
}
if (segment == 0x02 || segment == 0x03) {
@@ -1897,5 +1911,3 @@
using the PSM channel so we know which sub-dissector to call */
register_tap_listener("btsdp", NULL, NULL, TL_IS_DISSECTOR_HELPER, NULL, btl2cap_sdp_tap_packet, NULL);
}
-
-
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-cip.c
^
|
| @@ -17,7 +17,7 @@
* Heuristic object support for common services
* Michael Mann * Copyright 2011
*
- * $Id: packet-cip.c 43258 2012-06-14 13:43:34Z wmeier $
+ * $Id: packet-cip.c 44360 2012-08-08 20:52:36Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -3540,25 +3540,32 @@
num_services = tvb_get_letohs( tvb, offset);
proto_tree_add_item(tree, hf_cip_sc_mult_serv_pack_num_services, tvb, offset, 2, ENC_LITTLE_ENDIAN);
- /* Add services */
- cip_req_info = (cip_req_info_t*)p_get_proto_data( pinfo->fd, proto_cip );
- if ( cip_req_info )
- {
- if ( cip_req_info->pData == NULL )
- {
- mr_mult_req_info = se_alloc(sizeof(mr_mult_req_info_t));
- mr_mult_req_info->service = SC_MULT_SERV_PACK;
- mr_mult_req_info->num_services = num_services;
- mr_mult_req_info->requests = se_alloc(sizeof(cip_req_info_t)*num_services);
- memset(mr_mult_req_info->requests, 0, sizeof(cip_req_info_t)*num_services);
- cip_req_info->pData = mr_mult_req_info;
- }
- else
- {
- mr_mult_req_info = (mr_mult_req_info_t*)cip_req_info->pData;
- if ( mr_mult_req_info && mr_mult_req_info->num_services != num_services )
- mr_mult_req_info = NULL;
- }
+ /* Ensure a rough sanity check */
+ if (num_services*2 > tvb_reported_length_remaining(tvb, offset+2))
+ {
+ expert_add_info_format(pinfo, item, PI_MALFORMED, PI_WARN, "Multiple Service Packet too many services for packet");
+ }
+ else
+ {
+ /* Add services */
+ cip_req_info = (cip_req_info_t*)p_get_proto_data( pinfo->fd, proto_cip );
+ if ( cip_req_info )
+ {
+ if ( cip_req_info->pData == NULL )
+ {
+ mr_mult_req_info = se_alloc(sizeof(mr_mult_req_info_t));
+ mr_mult_req_info->service = SC_MULT_SERV_PACK;
+ mr_mult_req_info->num_services = num_services;
+ mr_mult_req_info->requests = se_alloc0(sizeof(cip_req_info_t)*num_services);
+ cip_req_info->pData = mr_mult_req_info;
+ }
+ else
+ {
+ mr_mult_req_info = (mr_mult_req_info_t*)cip_req_info->pData;
+ if ( mr_mult_req_info && mr_mult_req_info->num_services != num_services )
+ mr_mult_req_info = NULL;
+ }
+ }
}
for( i=0; i < num_services; i++ )
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-ctdb.c
^
|
| @@ -2,7 +2,7 @@
* Routines for CTDB (Cluster TDB) dissection
* Copyright 2007, Ronnie Sahlberg
*
- * $Id: packet-ctdb.c 39607 2011-10-26 18:01:12Z alagoutte $
+ * $Id: packet-ctdb.c 44404 2012-08-09 22:12:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -30,6 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
+#include <epan/expert.h>
#include <epan/emem.h>
/* Initialize the protocol and registered fields */
@@ -277,12 +278,14 @@
return offset;
}
-static int dissect_control_get_nodemap_reply(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, guint32 status _U_, int endianess)
+#define CTDB_MAX_NODES 500 /* Arbitrary. */
+static int dissect_control_get_nodemap_reply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, guint32 status _U_, int endianess)
{
guint32 num_nodes;
+ proto_item *item;
/* num nodes */
- proto_tree_add_item(tree, hf_ctdb_num_nodes, tvb, offset, 4, endianess);
+ item = proto_tree_add_item(tree, hf_ctdb_num_nodes, tvb, offset, 4, endianess);
if(endianess){
num_nodes=tvb_get_letohl(tvb, offset);
} else {
@@ -290,6 +293,11 @@
}
offset+=4;
+ if (num_nodes > CTDB_MAX_NODES) {
+ expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "Too many nodes (%u). Stopping dissection.", num_nodes);
+ THROW(ReportedBoundsError);
+ }
+
while(num_nodes--){
/* vnn */
proto_tree_add_item(tree, hf_ctdb_vnn, tvb, offset, 4, endianess);
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-dcp-etsi.c
^
|
| @@ -2,7 +2,7 @@
* Routines for ETSI Distribution & Communication Protocol
* Copyright 2006, British Broadcasting Corporation
*
- * $Id: packet-dcp-etsi.c 40163 2011-12-13 00:02:30Z wmeier $
+ * $Id: packet-dcp-etsi.c 44309 2012-08-07 19:29:44Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -511,14 +511,13 @@
gboolean save_fragmented = pinfo->fragmented;
guint16 real_len = tvb_length(tvb)-offset;
proto_tree_add_item (pft_tree, hf_edcp_pft_payload, tvb, offset, real_len, ENC_NA);
- if(real_len != payload_len) {
+ if(real_len != payload_len || real_len == 0) {
if(li)
proto_item_append_text(li, " (length error (%d))", real_len);
}
- next_tvb = dissect_pft_fragmented(tvb, pinfo, pft_tree,
- findex, fcount, seq, offset, real_len,
- fec, rsk, rsz
- );
+ if (real_len)
+ next_tvb = dissect_pft_fragmented(tvb, pinfo, pft_tree, findex, fcount,
+ seq, offset, real_len, fec, rsk, rsz);
pinfo->fragmented = save_fragmented;
} else {
next_tvb = tvb_new_subset_remaining (tvb, offset);
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-dns.c
^
|
| @@ -2,7 +2,7 @@
* Routines for DNS packet disassembly
* Copyright 2004, Nicolas DICHTEL - 6WIND - <nicolas.dichtel@6wind.com>
*
- * $Id: packet-dns.c 42271 2012-04-26 16:47:37Z wmeier $
+ * $Id: packet-dns.c 44430 2012-08-10 17:51:09Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -26,7 +26,7 @@
/*
* RFC 1034, RFC 1035
* RFC 2136 for dynamic DNS
- * http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt
+ * http://datatracker.ietf.org/doc/draft-cheshire-dnsext-multicastdns/
* for multicast DNS
* RFC 4795 for link-local multicast name resolution (LLMNR)
*/
@@ -48,6 +48,7 @@
#include "packet-tcp.h"
#include <epan/prefs.h>
#include <epan/strutil.h>
+#include <epan/expert.h>
static int proto_dns = -1;
static int hf_dns_length = -1;
@@ -63,6 +64,7 @@
static int hf_dns_flags_recavail = -1;
static int hf_dns_flags_z = -1;
static int hf_dns_flags_authenticated = -1;
+static int hf_dns_flags_ad = -1;
static int hf_dns_flags_checkdisable = -1;
static int hf_dns_flags_rcode = -1;
static int hf_dns_transaction_id = -1;
@@ -207,33 +209,44 @@
#define T_AAAA 28 /* IPv6 address (RFC 1886) */
#define T_LOC 29 /* geographical location (RFC 1876) */
#define T_NXT 30 /* "next" name (RFC 2535) */
-#define T_EID 31 /* ??? (Nimrod?) */
-#define T_NIMLOC 32 /* ??? (Nimrod?) */
+#define T_EID 31 /* Endpoint Identifier */
+#define T_NIMLOC 32 /* Nimrod Locator */
#define T_SRV 33 /* service location (RFC 2052) */
-#define T_ATMA 34 /* ??? */
+#define T_ATMA 34 /* ATM Address */
#define T_NAPTR 35 /* naming authority pointer (RFC 3403) */
#define T_KX 36 /* Key Exchange (RFC 2230) */
#define T_CERT 37 /* Certificate (RFC 4398) */
-#define T_A6 38 /* IPv6 address with indirection (RFC 2874) */
+#define T_A6 38 /* IPv6 address with indirection (RFC 2874 - obsolete) */
#define T_DNAME 39 /* Non-terminal DNS name redirection (RFC 2672) */
+#define T_SINK 40 /* SINK */
#define T_OPT 41 /* OPT pseudo-RR (RFC 2671) */
#define T_APL 42 /* Lists of Address Prefixes (APL RR) (RFC 3123) */
#define T_DS 43 /* Delegation Signature(RFC 3658) */
#define T_SSHFP 44 /* Using DNS to Securely Publish SSH Key Fingerprints (RFC 4255) */
-#define T_IPSECKEY 45 /* draft-ietf-ipseckey-rr */
-#define T_RRSIG 46 /* future RFC 2535bis */
-#define T_NSEC 47 /* future RFC 2535bis */
-#define T_DNSKEY 48 /* future RFC 2535bis */
+#define T_IPSECKEY 45 /* RFC 4025 */
+#define T_RRSIG 46 /* RFC 4034 */
+#define T_NSEC 47 /* RFC 4034 */
+#define T_DNSKEY 48 /* RFC 4034 */
#define T_DHCID 49 /* DHCID RR (RFC 4701) */
#define T_NSEC3 50 /* Next secure hash (RFC 5155) */
#define T_NSEC3PARAM 51 /* NSEC3 parameters (RFC 5155) */
+#define T_TLSA 52 /* TLSA */
#define T_HIP 55 /* Host Identity Protocol (HIP) RR (RFC 5205) */
+#define T_NINFO 56 /* NINFO */
+#define T_RKEY 57 /* RKEY */
+#define T_TALINK 58 /* Trust Anchor LINK */
+#define T_CDS 59 /* Child DS */
#define T_SPF 99 /* SPF RR (RFC 4408) section 3 */
#define T_TKEY 249 /* Transaction Key (RFC 2930) */
#define T_TSIG 250 /* Transaction Signature (RFC 2845) */
+#define T_IXFR 251 /* incremental transfer (RFC 1995) */
+#define T_AXFR 252 /* transfer of an entire zone (RFC 5936) */
+#define T_MAILB 253 /* mailbox-related RRs (MB, MG or MR) (RFC 1035) */
+#define T_MAILA 254 /* mail agent RRs (OBSOLETE - see MX) (RFC 1035) */
+#define T_ANY 255 /* A request for all records (RFC 1035) */
+#define T_DLV 32769 /* DNSSEC Lookaside Validation (DLV) DNS Resource Record (RFC 4431) */
#define T_WINS 65281 /* Microsoft's WINS RR */
#define T_WINS_R 65282 /* Microsoft's WINS-R RR */
-#define T_DLV 32769 /* DNSSEC Lookaside Validation (DLV) DNS Resource Record (RFC 4431) */
/* Class values */
#define C_IN 1 /* the Internet */
@@ -480,43 +493,42 @@
{ T_CERT, "CERT" }, /* RFC 4398 */
{ T_A6, "A6" }, /* RFC 2874 */
{ T_DNAME, "DNAME" }, /* RFC 2672 */
-
+ { T_SINK, "SINK" },
{ T_OPT, "OPT" }, /* RFC 2671 */
{ T_APL, "APL" }, /* RFC 3123 */
{ T_DS, "DS" }, /* RFC 3658 */
- { T_SSHFP, "SSHFP" }, /* Using DNS to Securely Publish SSH Key Fingerprints (RFC 4255) */
- { T_IPSECKEY, "IPSECKEY" }, /* draft-ietf-ipseckey-rr */
- { T_RRSIG, "RRSIG" }, /* future RFC 2535bis */
- { T_NSEC, "NSEC" }, /* future RFC 2535bis */
- { T_DNSKEY, "DNSKEY" }, /* future RFC 2535bis */
- { T_DHCID, "DHCID" }, /* DHCID RR (RFC 4701) */
- { T_NSEC3, "NSEC3" }, /* Next secure hash (RFC 5155) */
- { T_NSEC3PARAM, "NSEC3PARAM" }, /* Next secure hash (RFC 5155) */
-
- { T_HIP, "HIP" }, /* Host Identity Protocol (HIP) RR (RFC 5205) */
-
-
-
- { T_SPF, "SPF" }, /* SPF RR (RFC 4408) section 3 */
- { 100, "UINFO" },
- { 101, "UID" },
- { 102, "GID" },
- { 103, "UNSPEC" },
+ { T_SSHFP, "SSHFP" }, /* RFC 4255 */
+ { T_IPSECKEY, "IPSECKEY" }, /* RFC 4025 */
+ { T_RRSIG, "RRSIG" }, /* RFC 4034 */
+ { T_NSEC, "NSEC" }, /* RFC 4034 */
+ { T_DNSKEY, "DNSKEY" }, /* RFC 4034 */
+ { T_DHCID, "DHCID" }, /* RFC 4701 */
+ { T_NSEC3, "NSEC3" }, /* RFC 5155 */
+ { T_NSEC3PARAM, "NSEC3PARAM" }, /* RFC 5155 */
+ { T_TLSA, "TLSA" },
+ { T_HIP, "HIP" }, /* RFC 5205 */
+ { T_RKEY, "RKEY" },
+ { T_TALINK, "TALINK" },
+ { T_CDS, "CDS" },
+ { T_SPF, "SPF" }, /* RFC 4408 */
+ { 100, "UINFO" }, /* IANA reserved */
+ { 101, "UID" }, /* IANA reserved */
+ { 102, "GID" }, /* IANA reserved */
+ { 103, "UNSPEC" }, /* IANA reserved */
{ T_TKEY, "TKEY" },
{ T_TSIG, "TSIG" },
+ { T_IXFR, "IXFR" },
+ { T_AXFR, "AXFR" },
+ { T_MAILA, "MAILB" },
+ { T_MAILB, "MAILA" },
+ { T_ANY, "ANY" },
+ { T_DLV, "DLV" }, /* RFC 4431 */
+
{ T_WINS, "WINS" },
{ T_WINS_R, "WINS-R" },
- { 251, "IXFR" },
- { 252, "AXFR" },
- { 253, "MAILB" },
- { 254, "MAILA" },
- { 255, "ANY" },
-
-
- { T_DLV, "DLV" }, /* Domain Lookaside Validation DNS Resource Record (RFC 4431) */
{0, NULL}
};
@@ -561,31 +573,35 @@
"IPv6 address", /* RFC 1886 */
"Location", /* RFC 1876 */
"Next", /* RFC 2535 */
- "EID",
- "NIMLOC",
+ "Endpoint identifier",
+ "Nimrod locator",
"Service location", /* RFC 2052 */
- "ATMA",
+ "ATM address",
"Naming authority pointer", /* RFC 2168 */
"Key Exchange", /* RFC 2230 */
"Certificate", /* RFC 4398 */
"IPv6 address with indirection", /* RFC 2874 */
"Non-terminal DNS name redirection", /* RFC 2672 */
- NULL,
+ "SINK",
"EDNS0 option", /* RFC 2671 */
"Lists of Address Prefixes", /* RFC 3123 */
"Delegation Signer", /* RFC 3658 */
"SSH public host key fingerprint", /* RFC 4255 */
- "key to use with IPSEC", /* draft-ietf-ipseckey-rr */
+ "Key to use with IPSEC", /* draft-ietf-ipseckey-rr */
"RR signature", /* future RFC 2535bis */
"Next secured", /* future RFC 2535bis */
"DNS public key", /* future RFC 2535bis */
"DHCP Information", /* RFC 4701 */
"Next secured hash", /* RFC 5155 */
"NSEC3 parameters", /* RFC 5155 */
+ "TLSA",
NULL,
NULL,
- NULL,
- "Host Identity Protocol"
+ "Host Identity Protocol", /* RFC 5205 */
+ "NINFO",
+ "RKEY",
+ "Trust Anchor LINK",
+ "Child DS"
};
const char *short_name;
const char *long_name;
@@ -608,19 +624,19 @@
break;
/* queries */
- case 251:
+ case T_IXFR:
long_name = "Request for incremental zone transfer"; /* RFC 1995 */
break;
- case 252:
+ case T_AXFR:
long_name = "Request for full zone transfer";
break;
- case 253:
+ case T_MAILB:
long_name = "Request for mailbox-related records";
break;
- case 254:
+ case T_MAILA:
long_name = "Request for mail agent resource records";
break;
- case 255:
+ case T_ANY:
long_name = "Request for all records";
break;
default:
@@ -3403,6 +3419,11 @@
if (flags & F_RESPONSE) {
proto_tree_add_item(field_tree, hf_dns_flags_authenticated,
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
+ } else if (flags & F_AUTHENTIC) {
+ proto_item *pi = proto_tree_add_item(field_tree, hf_dns_flags_ad,
+ tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
+ expert_add_info_format(pinfo, pi, PI_SECURITY, PI_WARN,
+ "AD bit set in DNS Query");
}
proto_tree_add_item(field_tree, hf_dns_flags_checkdisable,
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
@@ -3617,6 +3638,11 @@
FT_BOOLEAN, 16, TFS(&tfs_flags_authenticated), F_AUTHENTIC,
"Was the reply data authenticated by the server?", HFILL }},
+ { &hf_dns_flags_ad,
+ { "AD bit", "dns.flags.authenticated",
+ FT_BOOLEAN, 16, TFS(&tfs_set_notset), F_AUTHENTIC,
+ NULL, HFILL }},
+
{ &hf_dns_flags_checkdisable,
{ "Non-authenticated data", "dns.flags.checkdisable",
FT_BOOLEAN, 16, TFS(&tfs_flags_checkdisable), F_CHECKDISABLE,
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-erf.c
^
|
| @@ -1,7 +1,7 @@
/* packet-erf.c
* Routines for ERF encapsulation dissection
*
- * $Id: packet-erf.c 43106 2012-06-05 10:42:38Z etxrab $
+ * $Id: packet-erf.c 44431 2012-08-10 17:59:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -43,8 +43,6 @@
#define EXT_HDR_TYPE_CHANNELISED 12
#define EXT_HDR_TYPE_SIGNATURE 14
-#define DECHAN_MAX_AUG_INDEX 4
-
struct erf_mc_hdlc_hdrx {
guint16 byte01;
guint8 byte2;
@@ -92,16 +90,19 @@
guint8 byte1;
};
+#define DECHAN_MAX_LINE_RATE 5
+#define DECHAN_MAX_VC_SIZE 5
+#define DECHAN_MAX_AUG_INDEX 4
+
typedef struct sdh_g707_format_s
{
guint8 m_sdh_line_rate;
guint8 m_vc_size ;
- gint8 m_vc_index_array[DECHAN_MAX_AUG_INDEX];
- /* i = 4 --> ITU-T letter #E - index of AUG-64
- * i = 3 --> ITU-T letter #D - index of AUG-16
+ gint8 m_vc_index_array[DECHAN_MAX_AUG_INDEX];
+ /* i = 3 --> ITU-T letter #D - index of AUG-16
* i = 2 --> ITU-T letter #C - index of AUG-4,
- * i = 1 --> ITU-T letter #B -index of AUG-1
- * i = 0 --> ITU-T letter #A - index of AU3*/
+ * i = 1 --> ITU-T letter #B - index of AUG-1
+ * i = 0 --> ITU-T letter #A - index of AU3*/
} sdh_g707_format_t;
/* Initialize the protocol and registered fields */
@@ -159,7 +160,7 @@
static int hf_erf_ehdr_chan_res = -1;
static int hf_erf_ehdr_chan_virt_container_id = -1;
static int hf_erf_ehdr_chan_assoc_virt_container_size = -1;
-static int hf_erf_ehdr_chan_speed = -1;
+static int hf_erf_ehdr_chan_rate = -1;
static int hf_erf_ehdr_chan_type = -1;
/* Filter Hash extension header */
@@ -481,7 +482,7 @@
{ 0, NULL }
};
-static const value_string channelised_speed[] = {
+static const value_string channelised_rate[] = {
{ 0x00, "Reserved"},
{ 0x01, "STM-0 / STS-1"},
{ 0x02, "STM-1 / STS-3"},
@@ -695,27 +696,28 @@
}
static int
-channelised_fill_sdh_g707_format(sdh_g707_format_t* in_fmt, guint16 bit_flds, guint8 vc_size, guint8 speed)
+channelised_fill_sdh_g707_format(sdh_g707_format_t* in_fmt, guint16 bit_flds, guint8 vc_size, guint8 rate)
{
- int i = 0; /* i = 4 --> ITU-T letter #E - index of AUG-64
- * i = 3 --> ITU-T letter #D - index of AUG-16
+ int i = 0; /* i = 3 --> ITU-T letter #D - index of AUG-16
* i = 2 --> ITU-T letter #C - index of AUG-4,
- * i = 1 --> ITU-T letter #B -index of AUG-1
- * i = 0 --> ITU-T letter #A - index of AU3*/
+ * i = 1 --> ITU-T letter #B - index of AUG-1
+ * i = 0 --> ITU-T letter #A - index of AU3*/
- if (0 == vc_size)
+ if ( (0 == vc_size) || (vc_size > DECHAN_MAX_VC_SIZE) || (rate > DECHAN_MAX_LINE_RATE) )
{
- /* unknown / unsed container size*/
+ /* unknown / unused / invalid container size or invalid line rate */
+ in_fmt->m_vc_size = 0;
+ in_fmt->m_sdh_line_rate = 0;
+ memset(&(in_fmt->m_vc_index_array[0]), 0x00, DECHAN_MAX_AUG_INDEX);
return -1;
}
+
in_fmt->m_vc_size = vc_size;
- in_fmt->m_sdh_line_rate = speed;
+ in_fmt->m_sdh_line_rate = rate;
memset(&(in_fmt->m_vc_index_array[0]), 0xff, DECHAN_MAX_AUG_INDEX);
- /* for STM64 traffic, start from #E index shoud be 0 */
- in_fmt->m_vc_index_array[ speed - 1] = 0;
/* for STM64 traffic,from #D and so on .. */
- for (i = (speed - 2); i >= 0; i--)
+ for (i = (rate - 2); i >= 0; i--)
{
guint8 aug_n_index = 0;
@@ -746,12 +748,17 @@
"VC4", /*0x2*/
"VC4-4c", /*0x3*/
"VC4-16c", /*0x4*/
- "VC4-64c", /*0x5*/
- "VC4-256c", /*0x6*/};
+ "VC4-64c", /*0x5*/};
+
+ if ( (in_fmt->m_vc_size > DECHAN_MAX_VC_SIZE) || (in_fmt->m_sdh_line_rate > DECHAN_MAX_LINE_RATE) )
+ {
+ ep_strbuf_printf(out_string, "Malformed");
+ return;
+ }
ep_strbuf_printf(out_string, "%s(",
- (in_fmt->m_vc_size < array_length(g_vc_size_strings)) ?
- g_vc_size_strings[in_fmt->m_vc_size] : g_vc_size_strings[0] );
+ (in_fmt->m_vc_size < array_length(g_vc_size_strings)) ?
+ g_vc_size_strings[in_fmt->m_vc_size] : g_vc_size_strings[0] );
if (in_fmt->m_sdh_line_rate <= 0 )
{
@@ -761,8 +768,8 @@
if ((in_fmt->m_vc_index_array[i] > 0) || (is_printed) )
{
ep_strbuf_append_printf(out_string, "%s%d",
- ((is_printed)?", ":""),
- in_fmt->m_vc_index_array[i]);
+ ((is_printed)?", ":""),
+ in_fmt->m_vc_index_array[i]);
is_printed = TRUE;
}
}
@@ -798,11 +805,11 @@
guint64 hdr = pinfo->pseudo_header->erf.ehdr_list[idx].ehdr;
guint8 vc_id = (guint8)((hdr >> 24) & 0xFF);
guint8 vc_size = (guint8)((hdr >> 16) & 0xFF);
- guint8 line_speed = (guint8)((hdr >> 8) & 0xFF);
+ guint8 line_rate = (guint8)((hdr >> 8) & 0xFF);
sdh_g707_format_t g707_format;
emem_strbuf_t *vc_id_string = ep_strbuf_new_label("");
- channelised_fill_sdh_g707_format(&g707_format, vc_id, vc_size, line_speed);
+ channelised_fill_sdh_g707_format(&g707_format, vc_id, vc_size, line_rate);
channelised_fill_vc_id_string(vc_id_string, &g707_format);
if (pseudo_hdr_tree) {
@@ -821,7 +828,7 @@
proto_tree_add_uint(int_tree, hf_erf_ehdr_chan_virt_container_id, tvb, 0, 0, vc_id);
proto_tree_add_text(int_tree, tvb, 0, 0, "Virtual Container ID (g.707): %s", vc_id_string->str);
proto_tree_add_uint(int_tree, hf_erf_ehdr_chan_assoc_virt_container_size, tvb, 0, 0, vc_size);
- proto_tree_add_uint(int_tree, hf_erf_ehdr_chan_speed, tvb, 0, 0, line_speed);
+ proto_tree_add_uint(int_tree, hf_erf_ehdr_chan_rate, tvb, 0, 0, line_rate);
proto_tree_add_uint(int_tree, hf_erf_ehdr_chan_type, tvb, 0, 0, (guint8)((hdr >> 0) & 0xFF));
}
}
@@ -1628,9 +1635,9 @@
{ &hf_erf_ehdr_chan_assoc_virt_container_size,
{ "Associated Virtual Container Size", "erf.ehdr.chan.vcsize",
FT_UINT8, BASE_HEX, VALS(channelised_assoc_virt_container_size), 0, NULL, HFILL } },
- { &hf_erf_ehdr_chan_speed,
+ { &hf_erf_ehdr_chan_rate,
{ "Origin Line Type/Rate", "erf.ehdr.chan.rate",
- FT_UINT8, BASE_HEX, VALS(channelised_speed), 0, NULL, HFILL } },
+ FT_UINT8, BASE_HEX, VALS(channelised_rate), 0, NULL, HFILL } },
{ &hf_erf_ehdr_chan_type,
{ "Frame Part Type", "erf.ehdr.chan.type",
FT_UINT8, BASE_HEX, VALS(channelised_type), 0, NULL, HFILL } },
@@ -1951,6 +1958,6 @@
/* Get handles for Ethernet dissectors */
ethwithfcs_handle = find_dissector("eth_withfcs");
ethwithoutfcs_handle = find_dissector("eth_withoutfcs");
-
+
sdh_handle = find_dissector("sdh");
}
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-fclctl.c
^
|
| @@ -2,7 +2,7 @@
* Routines for FC Link Control Frames
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fclctl.c 42632 2012-05-15 19:23:35Z wmeier $
+ * $Id: packet-fclctl.c 44506 2012-08-14 21:39:49Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -131,13 +131,13 @@
fclctl_get_paramstr (guint32 linkctl_type, guint32 param)
{
if (linkctl_type == FC_LCTL_PBSY) {
- return g_strdup_printf("%s, %s",
+ return ep_strdup_printf("%s, %s",
val_to_str (((param & 0xFF000000) >> 24), fc_lctl_pbsy_acode_val, "0x%x"),
val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_pbsy_rjt_val, "0x%x"));
}
if ((linkctl_type == FC_LCTL_FRJT) ||
(linkctl_type == FC_LCTL_PRJT)) {
- return g_strdup_printf("%s, %s",
+ return ep_strdup_printf("%s, %s",
val_to_str (((param & 0xFF000000) >> 24), fc_lctl_rjt_acode_val, "0x%x"),
val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_rjt_val, "%x"));
}
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-giop.c
^
|
| @@ -9,7 +9,7 @@
* Frank Singleton <frank.singleton@ericsson.com>
* Trevor Shepherd <eustrsd@am1.ericsson.se>
*
- * $Id: packet-giop.c 43058 2012-06-04 09:04:36Z etxrab $
+ * $Id: packet-giop.c 44409 2012-08-09 23:44:52Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -3586,6 +3586,7 @@
}
request_id = get_CDR_ulong(tvb, &offset, stream_is_big_endian,GIOP_HEADER_SIZE);
+ header->req_id = request_id;
if (check_col(pinfo->cinfo, COL_INFO))
{
col_append_fstr(pinfo->cinfo, COL_INFO, " id=%u", request_id);
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-gsm_a_common.c
^
|
| @@ -6,7 +6,7 @@
*
* Split from packet-gsm_a.c by Neil Piercy <Neil [AT] littlebriars.co.uk>
*
- * $Id: packet-gsm_a_common.c 43064 2012-06-04 12:20:37Z etxrab $
+ * $Id: packet-gsm_a_common.c 44410 2012-08-10 00:08:03Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -598,7 +598,9 @@
static int hf_gsm_a_8_psk_struct_present = -1;
static int hf_gsm_a_8_psk_struct = -1;
static int hf_gsm_a_modulation_capability = -1;
+static int hf_gsm_a_8_psk_rf_power_capability_1_present = -1;
static int hf_gsm_a_8_psk_rf_power_capability_1 = -1;
+static int hf_gsm_a_8_psk_rf_power_capability_2_present = -1;
static int hf_gsm_a_8_psk_rf_power_capability_2 = -1;
static int hf_gsm_a_gsm_400_band_info_present = -1;
static int hf_gsm_a_gsm_400_bands_supported = -1;
@@ -2404,10 +2406,10 @@
guint8 length;
proto_tree *subtree;
proto_item *item;
- guint32 bits_left, target_bit_offset;
+ guint32 bits_left, target_bit_offset, old_bit_offset;
guint64 multi_bnd_sup_fields, rsupport, multislotCapability;
guint64 msMeasurementCapability, msPosMethodCapPresent;
- guint64 ecsdMultiSlotCapability, eightPskStructPresent;
+ guint64 ecsdMultiSlotCapability, eightPskStructPresent, eightPskStructRfPowerCapPresent;
guint64 gsm400BandInfoPresent, gsm850AssocRadioCapabilityPresent;
guint64 gsm1900AssocRadioCapabilityPresent, dtmEGprsMultiSlotInfoPresent;
guint64 dtmEgprsMultiSlotClassPresent, singleBandSupport;
@@ -2605,20 +2607,37 @@
if (eightPskStructPresent == 1)
{
/* Extract 8-PSK struct */
- item = proto_tree_add_bits_item(tree, hf_gsm_a_8_psk_struct, tvb, bit_offset, 5, ENC_BIG_ENDIAN);
+ item = proto_tree_add_bits_item(tree, hf_gsm_a_8_psk_struct, tvb, bit_offset, -1, ENC_BIG_ENDIAN);
subtree = proto_item_add_subtree(item, ett_gsm_common_elem[DE_MS_CM_3]);
+ old_bit_offset = bit_offset;
/* Extract Modulation Capability */
proto_tree_add_bits_item(subtree, hf_gsm_a_modulation_capability, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
bit_offset = bit_offset + 1;
/* Extract 8_PSK RF Power Capability 1 */
- proto_tree_add_bits_item(subtree, hf_gsm_a_8_psk_rf_power_capability_1, tvb, bit_offset, 2, ENC_BIG_ENDIAN);
- bit_offset = bit_offset + 2;
+ proto_tree_add_bits_ret_val(subtree, hf_gsm_a_8_psk_rf_power_capability_1_present, tvb, bit_offset,
+ 1, &eightPskStructRfPowerCapPresent, ENC_BIG_ENDIAN);
+ bit_offset = bit_offset + 1;
+ if (eightPskStructRfPowerCapPresent == 1)
+ {
+ proto_tree_add_bits_item(subtree, hf_gsm_a_8_psk_rf_power_capability_1, tvb, bit_offset, 2, ENC_BIG_ENDIAN);
+ bit_offset = bit_offset + 2;
+ }
/* Extract 8_PSK RF Power Capability 2 */
- proto_tree_add_bits_item(subtree, hf_gsm_a_8_psk_rf_power_capability_2, tvb, bit_offset, 2, ENC_BIG_ENDIAN);
- bit_offset = bit_offset + 2;
+ proto_tree_add_bits_ret_val(subtree, hf_gsm_a_8_psk_rf_power_capability_2_present, tvb, bit_offset,
+ 1, &eightPskStructRfPowerCapPresent, ENC_BIG_ENDIAN);
+ bit_offset = bit_offset + 1;
+ if (eightPskStructRfPowerCapPresent == 1)
+ {
+ proto_tree_add_bits_item(subtree, hf_gsm_a_8_psk_rf_power_capability_2, tvb, bit_offset, 2, ENC_BIG_ENDIAN);
+ bit_offset = bit_offset + 2;
+ }
+ length = (guint8)((bit_offset - old_bit_offset)>>3);
+ if ((bit_offset - old_bit_offset) & 0x07)
+ length++;
+ proto_item_set_len(item, length);
}
/* { 0 | 1 < GSM 400 Bands Supported : { 01 | 10 | 11 } >
@@ -3831,11 +3850,21 @@
FT_BOOLEAN, BASE_NONE, TFS(&modulation_capability_vals), 0x00,
NULL, HFILL}
},
+ { &hf_gsm_a_8_psk_rf_power_capability_1_present,
+ { "8-PSK RF Power Capability 1 present", "gsm_a.classmark3.8_psk_rf_power_capability_1_present",
+ FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00,
+ NULL, HFILL}
+ },
{ &hf_gsm_a_8_psk_rf_power_capability_1,
{ "8-PSK RF Power Capability 1", "gsm_a.classmark3.8_psk_rf_power_capability_1",
FT_UINT8, BASE_HEX, VALS(eight_psk_rf_power_capability_vals), 0x00,
NULL, HFILL}
},
+ { &hf_gsm_a_8_psk_rf_power_capability_2_present,
+ { "8-PSK RF Power Capability 2 present", "gsm_a.classmark3.8_psk_rf_power_capability_2_present",
+ FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00,
+ NULL, HFILL}
+ },
{ &hf_gsm_a_8_psk_rf_power_capability_2,
{ "8-PSK RF Power Capability 2", "gsm_a.classmark3.8_psk_rf_power_capability_2",
FT_UINT8, BASE_HEX, VALS(eight_psk_rf_power_capability_vals), 0x00,
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-gsm_rlcmac.h
^
|
| @@ -5,7 +5,7 @@
* with the gracious authorization of STE
* Copyright (c) 2011 ST-Ericsson
*
- * $Id: packet-gsm_rlcmac.h 41149 2012-02-23 08:57:40Z etxrab $
+ * $Id: packet-gsm_rlcmac.h 44356 2012-08-08 19:02:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -4517,13 +4517,6 @@
PMO_AdditionsR98_t AdditionsR98;
} Packet_Measurement_Order_t;
-typedef struct
-{
- guint8 MESSAGE_TYPE;
- guint8 PAGE_MODE;
- PacketDownlinkID_t ID;
-} Packet_Measurement_Order_Reduced_t;
-
/* Enhanced measurement report */
typedef struct
@@ -4891,8 +4884,9 @@
guint8 MESSAGE_TYPE;
Packet_Access_Reject_t Packet_Access_Reject;
Packet_Cell_Change_Order_t Packet_Cell_Change_Order;
+ Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue;
Packet_Downlink_Assignment_t Packet_Downlink_Assignment;
- Packet_Measurement_Order_Reduced_t Packet_Measurement_Order;
+ Packet_Measurement_Order_t Packet_Measurement_Order;
Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data;
Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data;
Packet_Paging_Request_t Packet_Paging_Request;
@@ -4905,18 +4899,14 @@
Packet_TBF_Release_t Packet_TBF_Release;
Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack;
Packet_Uplink_Assignment_t Packet_Uplink_Assignment;
- Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue;
Packet_Handover_Command_t Packet_Handover_Command;
Packet_PhysicalInformation_t Packet_PhysicalInformation;
Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block;
-
PSI1_t PSI1;
PSI2_t PSI2;
PSI3_t PSI3;
- PSI3_BIS_t PSI3_BIS;
- PSI4_t PSI4;
- PSI13_t PSI13;
PSI5_t PSI5;
+ PSI13_t PSI13;
} u;
/* NrOfBits is placed after union to avoid unnecessary code changes when addressing the union members
@@ -4938,17 +4928,17 @@
Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure;
Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement;
Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack;
- EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack;
Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block;
Packet_Measurement_Report_t Packet_Measurement_Report;
Packet_Resource_Request_t Packet_Resource_Request;
Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status;
Packet_PSI_Status_t Packet_PSI_Status;
+ EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack;
+ Packet_Pause_t Packet_Pause;
Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report;
+ Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap;
Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification;
Packet_SI_Status_t Packet_SI_Status;
- Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap;
- Packet_Pause_t Packet_Pause;
} u;
gint16 NrOfBits;
} RlcMacUplink_t;
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-gtp.c
^
|
| @@ -1,6 +1,6 @@
/* packet-gtp.c
*
- * $Id: packet-gtp.c 43313 2012-06-17 16:19:27Z pascal $
+ * $Id: packet-gtp.c 44430 2012-08-10 17:51:09Z gerald $
*
* Routines for GTP dissection
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
@@ -8518,7 +8518,7 @@
},
{ &hf_gtp_qos_arp_pci,
{"Pre-emption Capability (PCI)", "gtp.qos_arp_pci",
- FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x40,
+ FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,
NULL, HFILL}
},
{ &hf_gtp_qos_arp_pl,
@@ -8528,7 +8528,7 @@
},
{ &hf_gtp_qos_arp_pvi,
{"Pre-emption Vulnerability (PVI)", "gtp.qos_arp_pvi",
- FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
+ FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
NULL, HFILL}
},
{&hf_gtp_qos_qci,
@@ -8858,7 +8858,7 @@
},
{&hf_gtp_earp_pvi,
{ "PVI Pre-emption Vulnerability", "gtp.EARP_pre_emption_par_vulnerability",
- FT_UINT8, BASE_DEC, NULL, 0x01,
+ FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
NULL, HFILL}
},
{&hf_gtp_earp_pl,
@@ -8868,7 +8868,7 @@
},
{&hf_gtp_earp_pci,
{ "PCI Pre-emption Capability", "gtp.EARP_pre_emption_Capability",
- FT_UINT8, BASE_DEC, NULL, 0x40,
+ FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,
NULL, HFILL}
},
{&hf_gtp_cdr_app,
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-gtpv2.c
^
|
| @@ -3,7 +3,7 @@
* Routines for GTPv2 dissection
* Copyright 2009 - 2011, Anders Broman <anders.broman [at] ericcsson.com>
*
- * $Id: packet-gtpv2.c 42739 2012-05-21 08:21:26Z etxrab $
+ * $Id: packet-gtpv2.c 44430 2012-08-10 17:51:09Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -5884,9 +5884,16 @@
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
+ /* Bit 1 PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29],
+ * clause 5.3.47 Pre-emption-Vulnerability AVP.
+ * 5.3.47 Pre-emption-Vulnerability AVP
+ * The following values are defined:
+ * PRE-EMPTION_VULNERABILITY_ENABLED (0)
+ * PRE-EMPTION_VULNERABILITY_DISABLED (1)
+ */
{&hf_gtpv2_bearer_qos_pvi,
{"PVI (Pre-emption Vulnerability)", "gtpv2.bearer_qos_pvi",
- FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
+ FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
NULL, HFILL}
},
{&hf_gtpv2_bearer_qos_pl,
@@ -5894,9 +5901,16 @@
FT_UINT8, BASE_DEC, NULL, 0x3c,
NULL, HFILL}
},
+ /* Bit 7 PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP.
+ * clause 5.3.46 Pre-emption-Capability AVP.
+ * 5.3.46 Pre-emption-Capability AVP
+ * The following values are defined:
+ * PRE-EMPTION_CAPABILITY_ENABLED (0)
+ * PRE-EMPTION_CAPABILITY_DISABLED (1)
+ */
{&hf_gtpv2_bearer_qos_pci,
{"PCI (Pre-emption Capability)", "gtpv2.bearer_qos_pci",
- FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x40,
+ FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,
NULL, HFILL}
},
{&hf_gtpv2_bearer_qos_label_qci,
@@ -6619,7 +6633,7 @@
},
{ &hf_gtpv2_arp_pvi,
{"Pre-emption Vulnerability (PVI)", "gtpv2.arp_pvi",
- FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
+ FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
NULL, HFILL}
},
{ &hf_gtpv2_arp_pl,
@@ -6629,7 +6643,7 @@
},
{ &hf_gtpv2_arp_pci,
{"Pre-emption Capability (PCI)", "gtpv2.arp_pci",
- FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x40,
+ FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,
NULL, HFILL}
},
{ &hf_gtpv2_mm_context_higher_br_16mb_flg_len,
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-lisp.c
^
|
| @@ -2,7 +2,7 @@
* Routines for LISP Control Message dissection
* Copyright 2011, Lorand Jakab <lj@lispmon.net>
*
- * $Id: packet-lisp.c 41724 2012-03-21 18:20:44Z wmeier $
+ * $Id: packet-lisp.c 44506 2012-08-14 21:39:49Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -266,7 +266,7 @@
tir = proto_tree_add_text(lisp_tree, tvb, 0, 12 + INET_ADDRLEN,
"EID prefix: %s/%d, TTL: %s, %sAuthoritative, %s",
ip_to_str((guint8 *)&prefix_v4), prefix_mask,
- (ttl == 0xFFFFFFFF) ? "Unlimited" : g_strdup_printf("%d", ttl),
+ (ttl == 0xFFFFFFFF) ? "Unlimited" : ep_strdup_printf("%d", ttl),
(flags&LISP_MAP_AUTH) ? "" : "Not ", lisp_actions[act]);
offset += INET_ADDRLEN;
/* Update the INFO column if there is only one record */
@@ -279,7 +279,7 @@
tir = proto_tree_add_text(lisp_tree, tvb, 0, 12 + INET6_ADDRLEN,
"EID prefix: %s/%d, TTL: %s, %sAuthoritative, %s",
ip6_to_str(&prefix_v6), prefix_mask,
- (ttl == 0xFFFFFFFF) ? "Unlimited" : g_strdup_printf("%d", ttl),
+ (ttl == 0xFFFFFFFF) ? "Unlimited" : ep_strdup_printf("%d", ttl),
(flags&LISP_MAP_AUTH) ? "" : "Not ", lisp_actions[act]);
offset += INET6_ADDRLEN;
/* Update the INFO column if there is only one record */
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-mongo.c
^
|
| @@ -3,7 +3,7 @@
* Copyright 2010, Alexis La Goutte <alexis.lagoutte at gmail dot com>
* BSON dissection added 2011, Thomas Buchanan <tom at thomasbuchanan dot com>
*
- * $Id: packet-mongo.c 39868 2011-11-15 20:49:40Z wmeier $
+ * $Id: packet-mongo.c 44342 2012-08-08 15:56:25Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -239,8 +239,12 @@
return fcn_length;
}
+/* http://docs.mongodb.org/manual/reference/limits/ */
+/* http://www.mongodb.org/display/DOCS/Documents */
+#define BSON_MAX_NESTING 100
+#define BSON_MAX_DOC_SIZE (16 * 1000 * 1000)
static int
-dissect_bson_document(tvbuff_t *tvb, guint offset, proto_tree *tree, int hf_mongo_doc)
+dissect_bson_document(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int hf_mongo_doc, int nest_level)
{
gint32 document_length;
guint final_offset;
@@ -248,6 +252,27 @@
proto_tree *doc_tree, *elements_tree, *element_sub_tree, *objectid_sub_tree, *js_code_sub_tree, *js_scope_sub_tree;
document_length = tvb_get_letohl(tvb, offset);
+
+ ti = proto_tree_add_item(tree, hf_mongo_doc, tvb, offset, document_length, ENC_NA);
+ doc_tree = proto_item_add_subtree(ti, ett_mongo_doc);
+
+ proto_tree_add_item(doc_tree, hf_mongo_document_length, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+
+ if (nest_level > BSON_MAX_NESTING) {
+ expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "BSON document recursion exceeds %u", BSON_MAX_NESTING);
+ THROW(ReportedBoundsError);
+ }
+
+ if (document_length < 5) {
+ expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "BSON document length too short: %u", document_length);
+ THROW(ReportedBoundsError);
+ }
+
+ if (document_length > BSON_MAX_DOC_SIZE) {
+ expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "BSON document length too long: %u", document_length);
+ THROW(ReportedBoundsError);
+ }
+
if (document_length == 5) {
/* document with length 5 is an empty document */
/* don't display the element subtree */
@@ -255,11 +280,6 @@
return document_length;
}
- ti = proto_tree_add_item(tree, hf_mongo_doc, tvb, offset, document_length, ENC_NA);
- doc_tree = proto_item_add_subtree(ti, ett_mongo_doc);
-
- proto_tree_add_item(doc_tree, hf_mongo_document_length, tvb, offset, 4, ENC_LITTLE_ENDIAN);
-
final_offset = offset + document_length;
offset += 4;
@@ -297,7 +317,7 @@
break;
case BSON_ELEMENT_TYPE_DOC:
case BSON_ELEMENT_TYPE_ARRAY:
- offset += dissect_bson_document(tvb, offset, element_sub_tree, hf_mongo_document);
+ offset += dissect_bson_document(tvb, pinfo, offset, element_sub_tree, hf_mongo_document, nest_level+1);
break;
case BSON_ELEMENT_TYPE_BINARY:
e_len = tvb_get_letohl(tvb, offset);
@@ -358,7 +378,7 @@
doc_len = e_len - (str_len + 8);
js_scope = proto_tree_add_item(element_sub_tree, hf_mongo_element_value_js_scope, tvb, offset, doc_len, ENC_NA);
js_scope_sub_tree = proto_item_add_subtree(js_scope, ett_mongo_code);
- offset += dissect_bson_document(tvb, offset, js_scope_sub_tree, hf_mongo_document);
+ offset += dissect_bson_document(tvb, pinfo, offset, js_scope_sub_tree, hf_mongo_document, nest_level+1);
break;
case BSON_ELEMENT_TYPE_INT32:
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_int32, tvb, offset, 4, ENC_LITTLE_ENDIAN);
@@ -380,7 +400,7 @@
return document_length;
}
static int
-dissect_mongo_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_mongo_reply(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree)
{
proto_item *ti;
proto_tree *flags_tree;
@@ -406,7 +426,7 @@
for (i=1; i <= number_returned; i++)
{
- offset += dissect_bson_document(tvb, offset, tree, hf_mongo_document);
+ offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_document, 1);
}
return offset;
}
@@ -423,7 +443,7 @@
}
static int
-dissect_mongo_update(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_mongo_update(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree)
{
proto_item *ti;
proto_tree *flags_tree;
@@ -439,15 +459,15 @@
proto_tree_add_item(flags_tree, hf_mongo_update_flags_multiupdate, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
- offset += dissect_bson_document(tvb, offset, tree, hf_mongo_selector);
+ offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_selector, 1);
- offset += dissect_bson_document(tvb, offset, tree, hf_mongo_update);
+ offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_update, 1);
return offset;
}
static int
-dissect_mongo_insert(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_mongo_insert(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree)
{
proto_item *ti;
proto_tree *flags_tree;
@@ -460,14 +480,14 @@
offset += dissect_fullcollectionname(tvb, offset, tree);
while(offset < tvb_reported_length(tvb)) {
- offset += dissect_bson_document(tvb, offset, tree, hf_mongo_document);
+ offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_document, 1);
}
return offset;
}
static int
-dissect_mongo_query(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_mongo_query(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree)
{
proto_item *ti;
proto_tree *flags_tree;
@@ -491,10 +511,10 @@
proto_tree_add_item(tree, hf_mongo_number_to_return, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset +=4;
- offset += dissect_bson_document(tvb, offset, tree, hf_mongo_query);
+ offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_query, 1);
while(offset < tvb_reported_length(tvb)) {
- offset += dissect_bson_document(tvb, offset, tree, hf_mongo_return_field_selector);
+ offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_return_field_selector, 1);
}
return offset;
}
@@ -518,7 +538,7 @@
}
static int
-dissect_mongo_delete(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_mongo_delete(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree)
{
proto_item *ti;
proto_tree *flags_tree;
@@ -533,7 +553,7 @@
proto_tree_add_item(flags_tree, hf_mongo_delete_flags_singleremove, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
- offset += dissect_bson_document(tvb, offset, tree, hf_mongo_selector);
+ offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_selector, 1);
return offset;
}
@@ -596,25 +616,25 @@
switch(opcode){
case OP_REPLY:
- offset = dissect_mongo_reply(tvb, offset, mongo_tree);
+ offset = dissect_mongo_reply(tvb, pinfo, offset, mongo_tree);
break;
case OP_MSG:
offset = dissect_mongo_msg(tvb, offset, mongo_tree);
break;
case OP_UPDATE:
- offset = dissect_mongo_update(tvb, offset, mongo_tree);
+ offset = dissect_mongo_update(tvb, pinfo, offset, mongo_tree);
break;
case OP_INSERT:
- offset = dissect_mongo_insert(tvb, offset, mongo_tree);
+ offset = dissect_mongo_insert(tvb, pinfo, offset, mongo_tree);
break;
case OP_QUERY:
- offset = dissect_mongo_query(tvb, offset, mongo_tree);
+ offset = dissect_mongo_query(tvb, pinfo, offset, mongo_tree);
break;
case OP_GET_MORE:
offset = dissect_mongo_getmore(tvb, offset, mongo_tree);
break;
case OP_DELETE:
- offset = dissect_mongo_delete(tvb, offset, mongo_tree);
+ offset = dissect_mongo_delete(tvb, pinfo, offset, mongo_tree);
break;
case OP_KILL_CURSORS:
offset = dissect_mongo_kill_cursors(tvb, offset, mongo_tree);
@@ -626,7 +646,7 @@
if(offset < tvb_reported_length(tvb))
{
ti = proto_tree_add_item(mongo_tree, hf_mongo_unknown, tvb, offset, -1, ENC_NA);
- expert_add_info_format(pinfo, ti, PI_UNDECODED, PI_WARN, " Unknown Data (not interpreted)");
+ expert_add_info_format(pinfo, ti, PI_UNDECODED, PI_WARN, "Unknown Data (not interpreted)");
}
}
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-mpls-pm.c
^
|
| @@ -7,7 +7,7 @@
*
* Francesco Fondelli <francesco dot fondelli, gmail dot com>
*
- * $Id: packet-mpls-pm.c 43336 2012-06-18 17:26:50Z gerald $
+ * $Id: packet-mpls-pm.c 44123 2012-07-29 22:03:54Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -468,8 +468,8 @@
sid2 = tvb_get_guint8(tvb, offset + 9);
sid1 = tvb_get_guint8(tvb, offset + 10);
sid0 = tvb_get_guint8(tvb, offset + 11) & 0xC0;
- *sid = ((guint32) sid0 >> 6) | ((guint32) sid1 >> 8) |
- ((guint32) sid2 >> 16) | ((guint32) sid3 >> 24);
+ *sid = ((guint32)sid0 >> 6) | ((guint32)sid1 << 8) |
+ ((guint32)sid2 << 16) | ((guint32)sid3 << 24);
}
col_clear(pinfo->cinfo, COL_PROTOCOL);
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-mpls-y1711.c
^
|
| @@ -5,7 +5,7 @@
*
* Francesco Fondelli <francesco dot fondelli, gmail dot com>
*
- * $Id: packet-mpls-y1711.c 42632 2012-05-15 19:23:35Z wmeier $
+ * $Id: packet-mpls-y1711.c 44430 2012-08-10 17:51:09Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -60,6 +60,7 @@
static gint ett_mpls_y1711 = -1;
static dissector_handle_t mpls_y1711_handle;
+static dissector_handle_t data_handle;
static const value_string y1711_function_type_vals[] = {
{0x00, "Reserved" },
@@ -106,34 +107,25 @@
proto_item *ti = NULL;
int functype = -1;
int offset = 0;
+ tvbuff_t *data_tvb = NULL;
+
const guint8 allone[] = { 0xff, 0xff };
const guint8 allzero[] = { 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00 };
-
- /*
- * if called with main tree == null just set col info with func type
- * string and return
- */
- if (!tree) {
- if (check_col(pinfo->cinfo, COL_INFO)) {
- if (tvb_bytes_exist(tvb, offset, 1)) {
- functype = tvb_get_guint8(tvb, offset);
- col_append_fstr(pinfo->cinfo, COL_INFO, " (Y.1711: %s)",
- (functype == 0x01) ? "CV" :
- (functype == 0x02) ? "FDI" :
- (functype == 0x03) ? "BDI" :
- (functype == 0x07) ? "FDD" :
- "reserved/unknown");
- }
- }
- return 0;
- }
+
+ functype = tvb_get_guint8(tvb, offset);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " (Y.1711: %s)",
+ (functype == 0x01) ? "CV" :
+ (functype == 0x02) ? "FDI" :
+ (functype == 0x03) ? "BDI" :
+ (functype == 0x07) ? "FDD" :
+ "reserved/unknown");
/* sanity checks */
- if (!tvb_bytes_exist(tvb, offset, 44)) {
+ if (tvb_reported_length(tvb) < 44) {
/*
* ITU-T Y.1711, 5.3: PDUs must have a minimum payload length of
* 44 bytes
@@ -141,14 +133,17 @@
proto_tree_add_text(tree, tvb, offset, -1,
"Error: must have a minimum payload "
"length of 44 bytes");
- return 0;
+ data_tvb = tvb_new_subset_remaining(tvb, offset);
+ call_dissector(data_handle, data_tvb, pinfo, tree);
+
+ return tvb_reported_length(tvb);
}
ti = proto_tree_add_text(tree, tvb, offset, 44, "Y.1711 OAM");
mpls_y1711_tree = proto_item_add_subtree(ti, ett_mpls_y1711);
if (!mpls_y1711_tree)
- return 0;
+ return tvb_reported_length(tvb);
/* checks for exp, bos and ttl encoding */
if (mplsinfo->label != LABEL_OAM_ALERT)
@@ -425,6 +420,8 @@
dissector_add_uint("mpls.label",
LABEL_OAM_ALERT /* 14 */,
mpls_y1711_handle);
+
+ data_handle = find_dissector("data");
}
/*
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-nfs.c
^
|
| @@ -3,7 +3,7 @@
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
* Copyright 2000-2004, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding)
*
- * $Id: packet-nfs.c 43840 2012-07-20 00:36:09Z gerald $
+ * $Id: packet-nfs.c 44121 2012-07-29 21:43:11Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1092,6 +1092,7 @@
*pos = *name;
*pos += g_snprintf(*pos, (*len)+1, "%s", nns->name);
+ DISSECTOR_ASSERT((*pos-*name) <= *len);
return;
}
@@ -1105,7 +1106,8 @@
nfs_full_name_snoop(parent_nns, len, name, pos);
if(*name){
/* make sure components are '/' separated */
- *pos += g_snprintf(*pos, (*len)+1, "%s%s", ((*pos)[-1]!='/')?"/":"", nns->name);
+ *pos += g_snprintf(*pos, (*len+1) - (gulong)(*pos-*name), "%s%s", ((*pos)[-1]!='/')?"/":"", nns->name);
+ DISSECTOR_ASSERT((*pos-*name) <= *len);
}
return;
}
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-rtps2.c
^
|
| @@ -13,7 +13,7 @@
* 755 Maleta Ln, Ste 203
* Castle Rock, CO 80108
*
- * $Id: packet-rtps2.c 39646 2011-10-28 06:06:20Z etxrab $
+ * $Id: packet-rtps2.c 44353 2012-08-08 18:41:48Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -993,12 +993,11 @@
const char *label) {
if (tree) {
guint16 flags = NEXT_guint16(tvb, offset, FALSE); /* Always big endian */
- guint8 temp_buffer[20];
+ emem_strbuf_t *temp_buffer = ep_strbuf_new_label(NULL);
int i;
for (i = 0; i < 16; ++i) {
- temp_buffer[i] = ((flags & (1 << (15-i))) != 0) ? '1' : '0';
+ ep_strbuf_append_c(temp_buffer, ((flags & (1 << (15-i))) != 0) ? '1' : '0');
}
- temp_buffer[16] = '\0';
proto_tree_add_text(tree,
tvb,
@@ -1006,7 +1005,7 @@
2,
"%s: %s",
label,
- temp_buffer);
+ temp_buffer->str);
}
}
@@ -3064,7 +3063,8 @@
guint64 seq_base;
gint32 num_bits;
guint32 data;
- char temp_buff[MAX_BITMAP_SIZE];
+ emem_strbuf_t *temp_buff = ep_strbuf_new_label(NULL);
+ gchar *last_one;
int i, j, idx;
proto_item * ti;
proto_tree * bitmap_tree;
@@ -3086,27 +3086,23 @@
/* Reads the bits (and format the print buffer) */
idx = 0;
- temp_buff[0] = '\0';
for (i = 0; i < num_bits; i += 32) {
data = NEXT_guint32(tvb, offset, little_endian);
offset += 4;
for (j = 0; j < 32; ++j) {
datamask = (1 << (31-j));
- temp_buff[idx] = ((data & datamask) == datamask) ? '1':'0';
+ ep_strbuf_append_c(temp_buff, ((data & datamask) == datamask) ? '1':'0');
++idx;
- if (idx >= num_bits) {
- break;
- }
- if (idx >= MAX_BITMAP_SIZE-1) {
+ if (idx >= num_bits || temp_buff->len >= ITEM_LABEL_LENGTH - 1) {
break;
}
}
}
- temp_buff[idx] = '\0';
/* removes all the ending '0' */
- for (i = (int)strlen(temp_buff) - 1; (i>0 && temp_buff[i] == '0'); --i) {
- temp_buff[i] = '\0';
+ last_one = strrchr(temp_buff->str, '1');
+ if (last_one) {
+ ep_strbuf_truncate(temp_buff, (gsize) (last_one - temp_buff->str));
}
if (tree) {
@@ -3118,7 +3114,7 @@
label,
seq_base,
num_bits,
- temp_buff);
+ temp_buff->str);
bitmap_tree = proto_item_add_subtree(ti, ett_rtps_bitmap);
proto_tree_add_text(bitmap_tree,
tvb,
@@ -3132,13 +3128,13 @@
4,
"numBits: %u",
num_bits);
- if (temp_buff[0] != '\0') {
+ if (temp_buff->len > 0) {
proto_tree_add_text(bitmap_tree,
tvb,
original_offset + 12,
offset - original_offset - 12,
"bitmap: %s",
- temp_buff);
+ temp_buff->str);
}
}
return offset;
@@ -3163,7 +3159,8 @@
guint64 base;
gint32 num_bits;
guint32 data;
- char temp_buff[MAX_BITMAP_SIZE];
+ emem_strbuf_t *temp_buff = ep_strbuf_new_label(NULL);
+ gchar *last_one;
int i, j, idx;
proto_item * ti;
proto_tree * bitmap_tree;
@@ -3209,28 +3206,25 @@
/* Reads the bits (and format the print buffer) */
idx = 0;
- temp_buff[0] = '\0';
for (i = 0; i < num_bits; i += 32) {
data = NEXT_guint32(tvb, offset, little_endian);
offset += 4;
for (j = 0; j < 32; ++j) {
datamask = (1 << (31-j));
- temp_buff[idx] = ((data & datamask) != 0) ? '1':'0';
+ ep_strbuf_append_c(temp_buff, ((data & datamask) == datamask) ? '1':'0');
++idx;
- if (idx > num_bits) {
- break;
- }
- if (idx >= MAX_BITMAP_SIZE-1) {
+ if (idx >= num_bits || temp_buff->len >= ITEM_LABEL_LENGTH - 1) {
break;
}
}
}
- temp_buff[idx] = '\0';
- /* removes all (but the last one) characters '0' */
- for (i = (int)strlen(temp_buff) - 1; (i>0 && temp_buff[i] == '0'); --i) {
- temp_buff[i] = '\0';
+ /* removes all the ending '0' */
+ last_one = strrchr(temp_buff->str, '1');
+ if (last_one) {
+ ep_strbuf_truncate(temp_buff, (gsize) (last_one - temp_buff->str));
}
+
if (tree) {
ti = proto_tree_add_text(tree,
tvb,
@@ -3240,7 +3234,7 @@
label,
base,
num_bits,
- temp_buff);
+ temp_buff->str);
bitmap_tree = proto_item_add_subtree(ti, ett_rtps_bitmap);
proto_tree_add_text(bitmap_tree,
tvb,
@@ -3254,13 +3248,13 @@
4,
"numBits: %u",
num_bits);
- if (temp_buff[0] != '\0') {
+ if (temp_buff->len > 0) {
proto_tree_add_text(bitmap_tree,
tvb,
original_offset + base_size + 4,
offset - original_offset - base_size - 4,
"bitmap: %s",
- temp_buff);
+ temp_buff->str);
}
}
return offset;
@@ -9576,4 +9570,3 @@
void proto_reg_handoff_rtps2(void) {
heur_dissector_add("udp", dissect_rtps, proto_rtps);
}
-
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-sctp.c
^
|
| @@ -3,7 +3,7 @@
* Copyright 2000-2012 Michael Tuexen <tuexen [AT] fh-muenster.de>
* Copyright 2011 Thomas Dreibholz <dreibh [AT] iem.uni-due.de>
*
- * $Id: packet-sctp.c 43407 2012-06-20 13:35:24Z morriss $
+ * $Id: packet-sctp.c 44506 2012-08-14 21:39:49Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -384,6 +384,9 @@
{ PROTO_3GPP_M2AP_PROTOCOL_ID, "3GPP M2AP" },
{ PROTO_3GPP_M3AP_PROTOCOL_ID, "3GPP M3AP" },
{ SSH_PAYLOAD_PROTOCOL_ID, "SSH" },
+ { DIAMETER_PROTOCOL_ID, "DIAMETER" },
+ { DIAMETER_DTLS_PROTOCOL_ID, "DIAMETER OVER DTLS" },
+ { R14P_BER_PROTOCOL_ID, "R14P" },
{ 0, NULL } };
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-stun.c
^
|
| @@ -5,7 +5,7 @@
* Copyright 2007-2008, 8x8 Inc. <petithug@8x8.com>
* Copyright 2008, Gael Breard <gael@breard.org>
*
- * $Id: packet-stun.c 40444 2012-01-12 20:40:23Z wmeier $
+ * $Id: packet-stun.c 44367 2012-08-09 00:26:42Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -469,6 +469,12 @@
if ((stun_trans =
se_tree_lookup32_array(stun_info->transaction_pdus,
transaction_id_key)) == NULL) {
+
+ transaction_id_key[0].length = 3;
+ transaction_id_key[0].key = transaction_id;
+ transaction_id_key[1].length = 0;
+ transaction_id_key[1].key = NULL;
+
stun_trans=se_alloc(sizeof(stun_transaction_t));
stun_trans->req_frame=0;
stun_trans->rep_frame=0;
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-x25.c
^
|
| @@ -2,7 +2,7 @@
* Routines for X.25 packet disassembly
* Olivier Abad <oabad@noos.fr>
*
- * $Id: packet-x25.c 42632 2012-05-15 19:23:35Z wmeier $
+ * $Id: packet-x25.c 44409 2012-08-09 23:44:52Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -39,6 +39,7 @@
#include <epan/emem.h>
#include <epan/nlpid.h>
#include <epan/x264_prt_id.h>
+#include <epan/lapd_sapi.h>
/*
* Direction of packet.
@@ -2768,4 +2769,5 @@
x25_handle = find_dissector("x.25");
dissector_add_uint("llc.dsap", SAP_X25, x25_handle);
+ dissector_add_uint("lapd.sapi", LAPD_SAPI_X25, x25_handle);
}
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/dissectors/packet-xtp.c
^
|
| @@ -2,7 +2,7 @@
* Routines for Xpress Transport Protocol dissection
* Copyright 2008, Shigeo Nakamura <naka_shigeo@yahoo.co.jp>
*
- * $Id: packet-xtp.c 41645 2012-03-18 22:24:24Z wmeier $
+ * $Id: packet-xtp.c 44343 2012-08-08 16:09:52Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -32,6 +32,7 @@
#include <glib.h>
#include <epan/packet.h>
+#include <epan/expert.h>
#include <epan/ipproto.h>
#include <epan/in_cksum.h>
@@ -727,6 +728,7 @@
return;
}
+#define XTP_MAX_NSPANS 10000 /* Arbitrary. (Documentation link is dead.) */
static void
dissect_xtp_ecntl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint32 offset) {
@@ -735,8 +737,7 @@
proto_item *top_ti;
proto_tree *xtp_subtree;
struct xtp_ecntl ecntl[1];
- guint64 *spans, *p;
- guint32 spans_len;
+ guint spans_len;
guint i;
top_ti = proto_tree_add_text(tree, tvb, offset, len,
@@ -769,21 +770,15 @@
offset += 4;
len = len + XTP_HEADER_LEN - offset;
spans_len = 16 * ecntl->nspan;
+
if (len != spans_len) {
- proto_item_append_text(top_ti,
- ", bogus spans field length (%u, must be %u)",
- len, spans_len);
- return;
+ expert_add_info_format(pinfo, top_ti, PI_MALFORMED, PI_ERROR, "Number of spans (%u) incorrect. Should be %u.", ecntl->nspan, len);
+ THROW(ReportedBoundsError);
}
- /* spans(16n) */
- spans = ep_alloc0(spans_len);
- p = spans;
- for (i = 0; i < ecntl->nspan*2; i++) {
- guint64 span = tvb_get_ntohl(tvb, offset);
- span <<= 32;
- span += tvb_get_ntohl(tvb, offset+4);
- *p++ = span;
- offset += 8;
+
+ if (ecntl->nspan > XTP_MAX_NSPANS) {
+ expert_add_info_format(pinfo, top_ti, PI_MALFORMED, PI_ERROR, "Too many spans: %u", ecntl->nspan);
+ THROW(ReportedBoundsError);
}
/** add summary **/
@@ -815,15 +810,12 @@
tvb, offset, 4, ecntl->nspan);
offset += 4;
/* spans(16n) */
- p = spans;
for (i = 0; i < ecntl->nspan; i++) {
- proto_tree_add_uint64(xtp_subtree, hf_xtp_ecntl_span_left,
- tvb, offset, 8, *p);
- p++;
+ proto_tree_add_item(xtp_subtree, hf_xtp_ecntl_span_left,
+ tvb, offset, 8, ENC_LITTLE_ENDIAN);
offset += 8;
- proto_tree_add_uint64(xtp_subtree, hf_xtp_ecntl_span_right,
- tvb, offset, 8, *p);
- p++;
+ proto_tree_add_item(xtp_subtree, hf_xtp_ecntl_span_right,
+ tvb, offset, 8, ENC_LITTLE_ENDIAN);
offset += 8;
}
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/enterprise-numbers
^
|
| @@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2012-07-22)
+(last updated 2012-08-11)
SMI Network Management Private Enterprise Codes:
@@ -13314,9 +13314,9 @@
Oddbjorn Steffensen
oddbjorn&oddbjorn.bdc.no
3327
- Computer Associates Intl.
- Trevor Horsfall
- trevor.horsfall&ca.com
+ CA Technologies, Inc.
+ John Bird
+ john.bird&ca.com
3328
Indus River Networks, Inc.
Bradford Kemp
@@ -67019,9 +67019,9 @@
Laurence R. North
lnorth&swnorth.com
16867
- DataSynapse, Inc.
- Marc Elliott
- melliott&datasynapse.com
+ TIBCO Software, Inc. DSPG (previous was 'DataSynapse, Inc.')
+ Ryan Glen
+ dspg-pen-administrator&tibco.com
16868
Conseil Internet & Logiciels Libres, Jérôme Alet
Jérôme Alet
@@ -87993,9 +87993,9 @@
Frederick C. Druseikis
fdruseikis&team-ast.com
22109
- Technische Fachhochschule Berlin / University of Applied Sciences
- Andreas Wessel
- ldap&tfh-berlin.de
+ Beuth Hochschule Berlin / University of Applied Sciences
+ Harald Wackernagel
+ hrz&beuth-hochschule.de
22110
Airedale International Air Conditioning Ltd
Controls Department
@@ -121226,8 +121226,8 @@
jh-oid&skrt.org
30411
Parker Hannifin Corp
- Victor Meyer
- vmeyer&parker.com
+ Christopher J. Nappi
+ cnappi&parker.com
30412
Aeroflex Incorporated
David Hagood
@@ -140338,9 +140338,9 @@
Richard Factor
Rfactor&eventide.com
35189
- Thermo Electron LED GmbH
- Volker Henkel
- volker.henkel&thermofisher.com
+ Thermo Fisher Scientific Inc (previous was 'Thermo Electron LED GmbH')
+ John Peduzzi
+ john.peduzzi&thermofisher.com
35190
Great Connection
Martin Westin
@@ -144808,8 +144808,8 @@
richard&wosign.com
36306
University of Teesside
- Nigel Hodgson
- n.hodgson&scm.tees.ac.uk
+ UNIX Team (Bill Taylor)
+ updates&scm.tees.ac.uk
36307
SONUMA
Eric DENIS
@@ -149489,7 +149489,7 @@
37476
ViaThinkSoft
Daniel Marschall
- daniel-marschall&viathinksoft.de
+ oidra&viathinksoft.de
37477
SIGNALIS
Claude RICHARD
@@ -153747,7 +153747,7 @@
zhouyiliang
zhouyiliang_sky&163.com
38541
- XO Interactive, LLC
+ Concentric Cloud Solutions, LLC (previous was 'XO Interactive, LLC')
Kip Krauss
Interactive-SystemsSupport&xo.com
38542
@@ -159525,7 +159525,7 @@
39985
GRZ IT Center Linz GmbH
Ralph Hosp
- ralph.hosp&logis.at
+ ralph.hosp&grz.at
39986
Florida Department of Education
Ted Duncan
@@ -159535,9 +159535,9 @@
Jerry Castille
jerry.castille&pathmaker-group.com
39988
- NetCracker Technology Corp
- Sachin Rathee
- sachin.rathee&netcracker.com
+ Reserved
+ Removed 2012-07-30
+ ---none---
39989
LINE SEÑALIZACIÓN ELECTRÓNICA S.L.
JESÚS JIMÉNEZ MUÑOZ
@@ -160487,7 +160487,7 @@
Robin Kearney
robin&image-data.com
40226
- xNetBox Solutions
+ xNet Solutions Inc. (previous was 'xNetBox Solutions')
Tony Huang
support&xnetbox.com
40227
@@ -160531,7 +160531,7 @@
Miguel Angel Murillo Viñuales
murillovm&diba.cat
40237
- The Office of the Government Chief Information Officer / the Hong Kong Special Administrative Region Government
+ The Office of the Government Chief Information Officer of the Government of the Hong Kong Special Administrative Region
Dennis Ng
dccng&ogcio.gov.hk
40238
@@ -160594,6 +160594,534 @@
Lonnie Mandigo
Lonnie Mandigo
lonnie.mandigo&gmail.com
+40253
+ RunStone Technology Co., Ltd.
+ Julian Ding
+ julian&runstone.com
+40254
+ Particle Software Industries
+ David McIlwraith
+ david.mcilwraith&particlesoft.org
+40255
+ Zhiway Technologies CO., Ltd.
+ yi Huang
+ huangyi&zhiway.com.cn
+40256
+ EFG Bank SA
+ Daniel Rieille
+ it.security&efgbank.com
+40257
+ Arcontia Technology AB
+ Karl Thorén
+ karl.thoren&arcontia.se
+40258
+ REWAG Regensburger Energie- und Wasserversorgung AG & Co KG
+ Josef Fischer
+ j.fischer&rewag.de
+40259
+ BruderhausDiakonie Stiftung
+ Paul Landenberger
+ paul.landenberger&bruderhausdiakonie.de
+40260
+ Mongoose Metrics, LLC.
+ Charles H. Liggett, Jr.
+ chuck.liggett&mongoosemetrics.com
+40261
+ KeenSystems B.V.
+ Rob janssen
+ r.janssen&keensystems.eu
+40262
+ Airbnb, Inc.
+ Morten Kuehl
+ morten&airbnb.com
+40263
+ Bank of Latvia
+ Arnis Gigulis
+ arnis.gigulis&bank.lv
+40264
+ CIRTEC Medical Systems, LLC
+ Erik Morgan
+ IANA-Admin&CIRTECMed.Com
+40265
+ Derbyshire County Council
+ Rob Ellis
+ robert.ellis&derbyshire.gov.uk
+40266
+ zxc ltd
+ David Barrett
+ dave&zxc.co.nz
+40267
+ Anite Travel Ltd.
+ Geoff Gomez
+ geoff.gomez&anite.com
+40268
+ KRZN
+ Daniel van Soest
+ dvs&krzn.de
+40269
+ Kenshoo ltd
+ omer brandis
+ omer.brandis&kenshoo.com
+40270
+ Flexagon GmbH
+ Anh Ngoc Nguyen
+ nn&flexagon.de
+40271
+ Peconic Bay Medical Center
+ Rosemarie Lampitok
+ rlampitok&pbmedicalcenter.org
+40272
+ SLAC National Accelerator Laboratory
+ Dan Van Winkle
+ dandvan&slac.stanford.edu
+40273
+ XeroAtom Group Ltd
+ Edward Alekxandr
+ edward.alekxandr&xeroatom.com
+40274
+ Spire Payments Holdings S.a.r.l.
+ Pedro Gruenholz
+ Pedro.Gruenholz&spirepayments.com
+40275
+ blackholearchives.org
+ Fletch Hogan
+ operations&blackholearchives.org
+40276
+ Navy Federal Credit Union
+ Baskaran Arumugam
+ baskaran_arumugam&navyfederal.org
+40277
+ Cloudant, Inc.
+ Joan Touzet
+ joant&cloudant.com
+40278
+ Ocean-County Monmouth Amateur Radio Club, Inc. (OMARC)
+ Martin A Flynn
+ domain&n2mo.org
+40279
+ HAMILTON Bonaduz AG
+ Daniel Bombis
+ pcsupport&hamilton.ch
+40280
+ Sovtest-Internet Limited Company
+ Roman Dmitriev
+ admin&sovtest.ru
+40281
+ Bottega Verde Srl
+ Cristian Testa
+ cristian.testa&bottegaverde.com
+40282
+ NSB AS
+ Stig B. Sivertsen
+ stig.sivertsen&nsb.no
+40283
+ Soporcel, Sociedade Portuguesa de Papel, SA
+ Luis Cavaleiro
+ luis.cavaleiro&portucelsoporcel.com
+40284
+ Wavex Technology Ltd
+ Russell Tester
+ infrastructure&wavex.co.uk
+40285
+ British Columbia International School, Bangkok
+ Peter Bell
+ pbell&bcisb.net
+40286
+ Siclic SARL
+ Nicolas Brisac
+ contact&siclic.fr
+40287
+ Perfectly Posh LLC
+ Christian Sieber
+ christian&perfectlyposh.com
+40288
+ Delta Power Solutions India Pvt Ltd
+ Sunil Chavan
+ sunil.chavan&delta.co.in
+40289
+ TransLattice, Inc.
+ Michael Lyle
+ protocols&translattice.com
+40290
+ Government of Dane County, Wisconsin
+ Kevin Hammond
+ hammond.kevin&countyofdane.com
+40291
+ Central National Australia Pty Ltd
+ Scott Hordern
+ scott&cennat.com.au
+40292
+ Mekelle University
+ Eric Lembregts
+ eric&lembregts.eu
+40293
+ TG Byte Software GmbH
+ Thilo-Alexander Ginkel
+ tg&tgbyte.de
+40294
+ OOO "Jewelry House "Kristall"
+ Shmurgalkin Oleg
+ postmaster&kristall-shop.ru
+40295
+ dogado Internet GmbH
+ Sascha Schiller
+ ssc&dogado.de
+40296
+ stocka
+ Geoffrey GUERET
+ geoffrey&stocka.net
+40297
+ Hytera Communications Co.,Ltd.
+ Yiyang Zhong
+ zhongyiyang&hytera.com
+40298
+ Thad Touchton
+ Thad Touchton
+ thad.touchton&gmail.com
+40299
+ Peter Janke
+ Peter Janke
+ peter&pjml.ca
+40300
+ Radialogica, LLC
+ Bryan Cool
+ bryan&radialogica.com
+40301
+ Esis Enerji ve Elektronik San. Tic. A.S.
+ Emrah AYDIN
+ emrah.aydin&esis.com.tr
+40302
+ Oozlum
+ Chris Smith
+ chris.smith&oozlum.co.uk
+40303
+ Anix Networks, Inc.
+ Anthony Lin
+ anthony.lin&anixnetworks.net
+40304
+ Wacker Neuson SE
+ Thomas Herzberger
+ thomas.herzberger&wackerneuson.com
+40305
+ Eletrosul Centrais Elétricas S/A
+ Luís Gustavo Coelho
+ internet.suporte&eletrosul.gov.br
+40306
+ Pointstore
+ Mark shepstone
+ mark&pointstore.co.za
+40307
+ Great River Technology
+ Paul Grunwald
+ pgrunwald&greatrivertech.com
+40308
+ Fundația Ceata
+ Tiberiu C. Turbureanu
+ tct&ceata.org
+40309
+ UNICART EOOD
+ Iliya Bazlyankov
+ iliya.bazlyankov&unicart.bg
+40310
+ Cumulus Networks, inc
+ JR Rivers
+ jrrivers&cumulusnetworks.com
+40311
+ ECHOES Technologies SAS
+ Florent Poinsaut
+ florent.poinsaut&echoes-tech.com
+40312
+ Denbridge Marine Ltd.
+ Jonathan Brady
+ software&denbridgemarine.com
+40313
+ goRill Solutions
+ Stefan Kaderabek
+ kaderabe&gorill.at
+40314
+ Universidad Europea de Madrid
+ Juan Carlos Corbacho
+ jcarlos.corbacho&uem.es
+40315
+ M&L Solution
+ haeyeon, hwang
+ hyhwang&mnlsolution.com
+40316
+ VastRiver Technology Co.,Ltd.
+ Zheng Haiou
+ zhenghaiou&vastriver.com
+40317
+ Alltech Group
+ Nikita Filimonov
+ it&alltech.ru
+40318
+ Budikom
+ Mateusz Skała
+ mateusz.skala&budikom.net
+40319
+ Canto GmbH
+ Thomas Schleu
+ tschleu&canto.com
+40320
+ Convene Networks
+ Kevin Dauster
+ kdauster&developingsolutions.com
+40321
+ Vitroconnect GmbH
+ Florian Lohoff
+ flo&vitroconnect.de
+40322
+ Jan Axelsson - DICOM2USB
+ Jan Axelsson
+ axelsson.jan&gmail.com
+40323
+ Big Nerd Ranch
+ Eric Jeffers
+ ejeffers&bignerdranch.com
+40324
+ The Woman's Christian Association of Jamestown, N.Y.
+ Laura Josephson
+ laura.josephson&wcahospital.org
+40325
+ Leon Gaming Limited
+ Vladislav Artemyev
+ vl&leongaming.com
+40326
+ Expertize
+ Fabrice Bucher
+ fbr&lanexpert.ch
+40327
+ Metal Expert LLC
+ Dmitry Demchenko
+ d.demchenko&metalcourier.com
+40328
+ Yunohost
+ Adrien Beudin
+ yunohost&yunohost.org
+40329
+ Tanaza S.r.l.
+ Sebastiano Bertani
+ sebastiano.bertani&tanaza.com
+40330
+ KuVision Digital Technology Ltd
+ Steve Freeman
+ sfreeman&kuvision.com
+40331
+ Micronica srl
+ Massimo Tomasi
+ massimo.tomasiµnicasrl.it
+40332
+ Syn-Apps LLC
+ Ian Pitts
+ ipitts&syn-apps.com
+40333
+ Enthought
+ Ognen Duzlevski
+ ognen&enthought.com
+40334
+ Mercury Security Corp.
+ Michael Serafin
+ michael.s&mercury-security.com
+40335
+ RMTech
+ Moon-il, Han
+ hmi&rmtechs.co.kr
+40336
+ Mericle Technologies, LLC.
+ Brian P. Mericle
+ brian&mericletechnologies.com
+40337
+ Centers for Medicare and Medicaid Services
+ Gregory Kreymer
+ gregory.kreymer&cms.hhs.gov
+40338
+ aizoOn Consulting s.r.l.
+ Antonio Rosina
+ support-it&aizoon.it
+40339
+ Anovio AG
+ Frank Flachenecker
+ frank.flachenecker&anovio.de
+40340
+ miersch-IT
+ Holger Miersch
+ hostmaster&miersch-it.de
+40341
+ Dalmartin Ltd
+ Steven Jupp
+ hostmaster&dalmartin.com
+40342
+ CronLab Ltd
+ Markus Nilsson
+ markus.nilsson&cronlab.com
+40343
+ E-Sales Soluções de Intergração
+ Cassio Cristiano
+ cassio.cristiano&esales.com.br
+40344
+ Falk Online
+ Sascha Falk
+ sfalk&falk-online.eu
+40345
+ JRE & Associates, Inc.
+ Jonathan Wilson
+ Support&jreitsolutions.com
+40346
+ Belarusian Universal Commodity Exchange
+ Valery Niachai
+ uc&butb.by
+40347
+ DUIT GmbH
+ Klaus Delille
+ delille&dvv.de
+40348
+ Snmart Grid Norway AS
+ Morten William Hansen
+ morten.hansen&smartgridnorway.no
+40349
+ EICSYS GmbH
+ Wojciech Jalmuzna
+ contact&eicsys.eu
+40350
+ Health Sciences Libraries Consortium
+ Alan Simon
+ simon&hslc.org
+40351
+ XO Communications LLC
+ Maeve O'Connor
+ security&xo.com
+40352
+ American Electric Power
+ Jon C. Kidder
+ jckidder&aep.com
+40353
+ Cirrus Software Engineering LLC
+ James MacLennan
+ cirrus.sw&gmail.com
+40354
+ Suttle Apparatus
+ Arif Ahsan
+ arifa&commsysinc.com
+40355
+ Domantic
+ Sebastien Lobstein
+ sebastien.lobstein&domantic.com
+40356
+ IT-CE
+ Philippe GUEUGNON
+ philippe.gueugnon&it-ce.fr
+40357
+ Michael Buth - IT Consulting
+ Michael Buth
+ michael.buth&mbuth.de
+40358
+ Mercado Libre S.R.L.
+ Agustin Gomez Roca
+ agustin.gomezroca&mercadolibre.com
+40359
+ Zeppelin GmbH
+ Daniel Ghita
+ daniel.ghita&zeppelin.com
+40360
+ IP Total Software S.A
+ Andrés Ortiz
+ julian.ortiz&iptotal.com
+40361
+ Xenya d.o.o.
+ Peter Reinhardt
+ peter.reinhardt&xenya.si
+40362
+ Cambridge Communication Systems
+ Iftah Bratspiess
+ iftah&web-silicon.com
+40363
+ Galambos Dániel
+ Daniel Galambos
+ galambos.dani&gmail.com
+40364
+ Trinity Desktop Project
+ Timothy Pearson
+ kb9vqf&pearsoncomputing.net
+40365
+ Weichi Consulting LLC
+ Marvin Wolfthal
+ maw&weichi.com
+40366
+ SHadrinsky Telephonny Zavod (SHTZ)
+ Alexey Roznin
+ prog8&shtz.shadrinsk.net
+40367
+ Elcom International Pvt Ltd
+ Mahesh Mudholkar
+ mc.mudholkar&elcom-in.com
+40368
+ DATA-1 Ltd.
+ Andrew Ivanov
+ ivanov&data-1.net
+40369
+ gruppenrichtlinien.de
+ Mark Heitbrink
+ mark&gruppenrichtlinien.de
+40370
+ Socialbakers a. s.
+ Martin Homolka
+ martin&socialbakers.com
+40371
+ Forcare B.V.
+ Rick Riemer
+ info&forcare.nl
+40372
+ Celab Ltd
+ Keith Harrison
+ keith.harrison&celab.co.uk
+40373
+ HealthForce Partners
+ James von Seggern
+ webmaster&healthforcepartners.com
+40374
+ ODYA Bilgisayar ve Teknoloji Urunleri San. ve Tic. Ltd. Sti.
+ Ali YAZICI
+ ali.yazici&odya.com.tr
+40375
+ Bayport Financial Services
+ GIdeon Serfontein
+ Gideon.Serfontein&bayport.co.za
+40376
+ Astorex Corp
+ Artem Gavrilov
+ admin&astorex.com
+40377
+ Independence School District
+ Jace Ferguson
+ jace_ferguson&isdschools.org
+40378
+ Innovative Technology Solutions, Inc.
+ Bradley Smith
+ bradley.smith&its-florida.net
+40379
+ Lower Bucks Hospital
+ Steven Kane
+ kanes&lowerbuckshospital.org
+40380
+ Arkologic, Inc.
+ Hung Lu
+ hungl&arkologic.com
+40381
+ Golub Capital
+ Doug Prine
+ dprine&golubcapital.com
+40382
+ Klimat prof Co.
+ Vladimir Losev
+ pkiinfo&klimat-prof.ru
+40383
+ CAME CANCELLI AUTOMATICI SPA
+ GIOVANNI CEGLIA
+ gceglia&came.com
+40384
+ Association of friends of japanese culture (SPJK)
+ Jana Křečková
+ yarche&spjk.cz
End of Document
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/sctpppids.h
^
|
| @@ -1,7 +1,7 @@
/* sctpppids.h
* Declarations of SCTP payload protocol IDs.
*
- * $Id: sctpppids.h 41556 2012-03-15 08:23:26Z tuexen $
+ * $Id: sctpppids.h 44506 2012-08-14 21:39:49Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -76,5 +76,8 @@
#define PROTO_3GPP_M2AP_PROTOCOL_ID 43
#define PROTO_3GPP_M3AP_PROTOCOL_ID 44
#define SSH_PAYLOAD_PROTOCOL_ID 45
+#define DIAMETER_PROTOCOL_ID 46
+#define DIAMETER_DTLS_PROTOCOL_ID 47
+#define R14P_BER_PROTOCOL_ID 48
#define M2TP_PAYLOAD_PROTOCOL_ID 99 /* s-link */
#endif /* sctpppids.h */
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/sminmpec.c
^
|
| @@ -3348,7 +3348,7 @@
{ 3324, "Call Technologies, Inc." },
{ 3325, "Vocalis Ltd." },
{ 3326, "Bergen Data Consulting" },
- { 3327, "Computer Associates Intl." },
+ { 3327, "CA Technologies, Inc." },
{ 3328, "Indus River Networks, Inc." },
{ 3329, "NewCom Technologies, Inc." },
{ 3330, "PartnerGroup" },
@@ -16888,7 +16888,7 @@
{ 16864, "{M:U} Consulting" },
{ 16865, "ZIM Technologies International Inc." },
{ 16866, "Software North, Inc." },
- { 16867, "DataSynapse, Inc." },
+ { 16867, "TIBCO Software, Inc. DSPG (previous was 'DataSynapse, Inc.')" },
{ 16868, "Conseil Internet & Logiciels Libres, J\0303\0251r\0303\0264me Alet" },
{ 16869, "ROMmon Ltd" },
{ 16870, "Banco do Estado do Rio Grande do Sul,S.A." },
@@ -22130,7 +22130,7 @@
{ 22106, "Vodafone SDEC" },
{ 22107, "The Florida Lottery" },
{ 22108, "Application Science and Technology" },
- { 22109, "Technische Fachhochschule Berlin / University of Applied Sciences" },
+ { 22109, "Beuth Hochschule Berlin / University of Applied Sciences" },
{ 22110, "Airedale International Air Conditioning Ltd" },
{ 22111, "Chilibyte Oy" },
{ 22112, "Vigil Security, LLC" },
@@ -35210,7 +35210,7 @@
{ 35186, "Hiromasa Nara" },
{ 35187, "kunming ucrown network system (china) ltd. co" },
{ 35188, "Eventide" },
- { 35189, "Thermo Electron LED GmbH" },
+ { 35189, "Thermo Fisher Scientific Inc (previous was 'Thermo Electron LED GmbH')" },
{ 35190, "Great Connection" },
{ 35191, "Applied Software Control Ltd." },
{ 35192, "Miracle Tan" },
@@ -38562,7 +38562,7 @@
{ 38538, "Sify Technologies Ltd" },
{ 38539, "ANKABUT (UAE Advanced Network for Research and Education)" },
{ 38540, "Phoebus Vision" },
- { 38541, "XO Interactive, LLC" },
+ { 38541, "Concentric Cloud Solutions, LLC (previous was 'XO Interactive, LLC')" },
{ 38542, "OpenIP" },
{ 38543, "Continental Lensa Ltd." },
{ 38544, "Asset Control International BV" },
@@ -40009,7 +40009,7 @@
{ 39985, "GRZ IT Center Linz GmbH" },
{ 39986, "Florida Department of Education" },
{ 39987, "Pathmaker Group, Inc." },
- { 39988, "NetCracker Technology Corp" },
+ { 39988, "Reserved" },
{ 39989, "LINE SE\0303\0221ALIZACI\0303\0223N ELECTR\0303\0223NICA S.L." },
{ 39990, "Center of Information Technologies of Volgograd region (http:\\\\citvo.ru)" },
{ 39991, "Aitia International Inc." },
@@ -40247,7 +40247,7 @@
{ 40223, "molotov.ro" },
{ 40224, "Willem4Ever BV" },
{ 40225, "Image Data Systems" },
- { 40226, "xNetBox Solutions" },
+ { 40226, "xNet Solutions Inc. (previous was 'xNetBox Solutions')" },
{ 40227, "Digital One" },
{ 40228, "Valley ComputerWorks, Inc. DBA Paragus Strategic I.T. " },
{ 40229, "VizionR" },
@@ -40258,7 +40258,7 @@
{ 40234, "Andreas Zieschang" },
{ 40235, "Stadt Dortmund" },
{ 40236, "Diputaci\0303\0263 de Barcelona" },
- { 40237, "The Office of the Government Chief Information Officer / the Hong Kong Special Administrative Region Government" },
+ { 40237, "The Office of the Government Chief Information Officer of the Government of the Hong Kong Special Administrative Region" },
{ 40238, "RoutoMessaging" },
{ 40239, "Gruppo Editoriale L'Espresso spa" },
{ 40240, "OpenSky.com" },
@@ -40274,6 +40274,138 @@
{ 40250, "Fiber Connections Inc." },
{ 40251, "coretanium.net" },
{ 40252, "Lonnie Mandigo" },
+ { 40253, "RunStone Technology Co., Ltd." },
+ { 40254, "Particle Software Industries" },
+ { 40255, "Zhiway Technologies CO., Ltd." },
+ { 40256, "EFG Bank SA" },
+ { 40257, "Arcontia Technology AB" },
+ { 40258, "REWAG Regensburger Energie- und Wasserversorgung AG & Co KG" },
+ { 40259, "BruderhausDiakonie Stiftung" },
+ { 40260, "Mongoose Metrics, LLC." },
+ { 40261, "KeenSystems B.V." },
+ { 40262, "Airbnb, Inc." },
+ { 40263, "Bank of Latvia" },
+ { 40264, "CIRTEC Medical Systems, LLC" },
+ { 40265, "Derbyshire County Council" },
+ { 40266, "zxc ltd" },
+ { 40267, "Anite Travel Ltd." },
+ { 40268, "KRZN" },
+ { 40269, "Kenshoo ltd" },
+ { 40270, "Flexagon GmbH" },
+ { 40271, "Peconic Bay Medical Center" },
+ { 40272, "SLAC National Accelerator Laboratory" },
+ { 40273, "XeroAtom Group Ltd" },
+ { 40274, "Spire Payments Holdings S.a.r.l." },
+ { 40275, "blackholearchives.org" },
+ { 40276, "Navy Federal Credit Union" },
+ { 40277, "Cloudant, Inc." },
+ { 40278, "Ocean-County Monmouth Amateur Radio Club, Inc. (OMARC)" },
+ { 40279, "HAMILTON Bonaduz AG" },
+ { 40280, "Sovtest-Internet Limited Company" },
+ { 40281, "Bottega Verde Srl" },
+ { 40282, "NSB AS" },
+ { 40283, "Soporcel, Sociedade Portuguesa de Papel, SA" },
+ { 40284, "Wavex Technology Ltd" },
+ { 40285, "British Columbia International School, Bangkok" },
+ { 40286, "Siclic SARL" },
+ { 40287, "Perfectly Posh LLC" },
+ { 40288, "Delta Power Solutions India Pvt Ltd" },
+ { 40289, "TransLattice, Inc." },
+ { 40290, "Government of Dane County, Wisconsin" },
+ { 40291, "Central National Australia Pty Ltd" },
+ { 40292, "Mekelle University" },
+ { 40293, "TG Byte Software GmbH" },
+ { 40294, "OOO \"Jewelry House \"Kristall\"" },
+ { 40295, "dogado Internet GmbH" },
+ { 40296, "stocka" },
+ { 40297, "Hytera Communications Co.,Ltd." },
+ { 40298, "Thad Touchton" },
+ { 40299, "Peter Janke" },
+ { 40300, "Radialogica, LLC" },
+ { 40301, "Esis Enerji ve Elektronik San. Tic. A.S." },
+ { 40302, "Oozlum" },
+ { 40303, "Anix Networks, Inc." },
+ { 40304, "Wacker Neuson SE" },
+ { 40305, "Eletrosul Centrais El\0303\0251tricas S/A" },
+ { 40306, "Pointstore" },
+ { 40307, "Great River Technology" },
+ { 40308, "Funda\0310\0233ia Ceata" },
+ { 40309, "UNICART EOOD" },
+ { 40310, "Cumulus Networks, inc" },
+ { 40311, "ECHOES Technologies SAS" },
+ { 40312, "Denbridge Marine Ltd." },
+ { 40313, "goRill Solutions" },
+ { 40314, "Universidad Europea de Madrid" },
+ { 40315, "M&L Solution" },
+ { 40316, "VastRiver Technology Co.,Ltd." },
+ { 40317, "Alltech Group" },
+ { 40318, "Budikom" },
+ { 40319, "Canto GmbH" },
+ { 40320, "Convene Networks" },
+ { 40321, "Vitroconnect GmbH" },
+ { 40322, "Jan Axelsson - DICOM2USB" },
+ { 40323, "Big Nerd Ranch" },
+ { 40324, "The Woman's Christian Association of Jamestown, N.Y." },
+ { 40325, "Leon Gaming Limited" },
+ { 40326, "Expertize" },
+ { 40327, "Metal Expert LLC" },
+ { 40328, "Yunohost" },
+ { 40329, "Tanaza S.r.l." },
+ { 40330, "KuVision Digital Technology Ltd" },
+ { 40331, "Micronica srl" },
+ { 40332, "Syn-Apps LLC" },
+ { 40333, "Enthought" },
+ { 40334, "Mercury Security Corp." },
+ { 40335, "RMTech" },
+ { 40336, "Mericle Technologies, LLC." },
+ { 40337, "Centers for Medicare and Medicaid Services" },
+ { 40338, "aizoOn Consulting s.r.l." },
+ { 40339, "Anovio AG" },
+ { 40340, "miersch-IT" },
+ { 40341, "Dalmartin Ltd" },
+ { 40342, "CronLab Ltd" },
+ { 40343, "E-Sales Solu\0303\0247\0303\0265es de Intergra\0303\0247\0303\0243o" },
+ { 40344, "Falk Online" },
+ { 40345, "JRE & Associates, Inc." },
+ { 40346, "Belarusian Universal Commodity Exchange" },
+ { 40347, "DUIT GmbH" },
+ { 40348, "Snmart Grid Norway AS" },
+ { 40349, "EICSYS GmbH" },
+ { 40350, "Health Sciences Libraries Consortium" },
+ { 40351, "XO Communications LLC" },
+ { 40352, "American Electric Power" },
+ { 40353, "Cirrus Software Engineering LLC" },
+ { 40354, "Suttle Apparatus" },
+ { 40355, "Domantic" },
+ { 40356, "IT-CE" },
+ { 40357, "Michael Buth - IT Consulting" },
+ { 40358, "Mercado Libre S.R.L." },
+ { 40359, "Zeppelin GmbH" },
+ { 40360, "IP Total Software S.A" },
+ { 40361, "Xenya d.o.o." },
+ { 40362, "Cambridge Communication Systems" },
+ { 40363, "Galambos D\0303\0241niel" },
+ { 40364, "Trinity Desktop Project" },
+ { 40365, "Weichi Consulting LLC" },
+ { 40366, "SHadrinsky Telephonny Zavod (SHTZ)" },
+ { 40367, "Elcom International Pvt Ltd" },
+ { 40368, "DATA-1 Ltd." },
+ { 40369, "gruppenrichtlinien.de" },
+ { 40370, "Socialbakers a. s." },
+ { 40371, "Forcare B.V." },
+ { 40372, "Celab Ltd" },
+ { 40373, "HealthForce Partners" },
+ { 40374, "ODYA Bilgisayar ve Teknoloji Urunleri San. ve Tic. Ltd. Sti." },
+ { 40375, "Bayport Financial Services" },
+ { 40376, "Astorex Corp" },
+ { 40377, "Independence School District" },
+ { 40378, "Innovative Technology Solutions, Inc." },
+ { 40379, "Lower Bucks Hospital" },
+ { 40380, "Arkologic, Inc." },
+ { 40381, "Golub Capital" },
+ { 40382, "Klimat prof Co." },
+ { 40383, "CAME CANCELLI AUTOMATICI SPA" },
+ { 40384, "Association of friends of japanese culture (SPJK)" },
{ 0, NULL}
};
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/tfs.c
^
|
| @@ -2,7 +2,7 @@
* true_false strings
* Copyright 2007, Jaap Keuter <jaap.keuter@xs4all.nl>
*
- * $Id: tfs.c 42035 2012-04-12 14:07:31Z etxrab $
+ * $Id: tfs.c 44409 2012-08-09 23:44:52Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -37,6 +37,7 @@
const true_false_string tfs_yes_no = { "Yes", "No" };
const true_false_string tfs_set_notset = { "Set", "Not set" };
const true_false_string tfs_enabled_disabled = { "Enabled", "Disabled" };
+const true_false_string tfs_disabled_enabled = { "Disabled", "Enabled" };
const true_false_string tfs_ok_error = { "Ok", "Error" };
const true_false_string tfs_error_ok = { "Error", "Ok" };
const true_false_string tfs_success_fail = { "Success", "Fail" };
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/epan/tfs.h
^
|
| @@ -2,7 +2,7 @@
* true_false strings
* Copyright 2007, Jaap Keuter <jaap.keuter@xs4all.nl>
*
- * $Id: tfs.h 42035 2012-04-12 14:07:31Z etxrab $
+ * $Id: tfs.h 44409 2012-08-09 23:44:52Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -44,6 +44,7 @@
WS_VAR_IMPORT const true_false_string tfs_yes_no;
WS_VAR_IMPORT const true_false_string tfs_set_notset;
WS_VAR_IMPORT const true_false_string tfs_enabled_disabled;
+WS_VAR_IMPORT const true_false_string tfs_disabled_enabled;
WS_VAR_IMPORT const true_false_string tfs_ok_error;
WS_VAR_IMPORT const true_false_string tfs_error_ok;
WS_VAR_IMPORT const true_false_string tfs_success_fail;
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/make-version.pl
^
|
| @@ -2,7 +2,7 @@
#
# Copyright 2004 Jörg Mayer (see AUTHORS file)
#
-# $Id: make-version.pl 43435 2012-06-21 19:34:13Z gerald $
+# $Id: make-version.pl 43951 2012-07-24 00:29:04Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -75,7 +75,7 @@
my %version_pref = (
"version_major" => 1,
"version_minor" => 8,
- "version_micro" => 1,
+ "version_micro" => 2,
"version_build" => 0,
"enable" => 1,
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/manuf
^
|
| @@ -4,7 +4,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf 43912 2012-07-22 14:34:08Z gerald $
+# $Id: manuf 44452 2012-08-12 14:34:01Z gerald $
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
@@ -5370,7 +5370,7 @@
00:14:E1 DataDisp # Data Display AG
00:14:E2 Datacom # datacom systems inc.
00:14:E3 Mm-Lab # mm-lab GmbH
-00:14:E4 Integral # Integral Technologies
+00:14:E4 Infinias # infinias, LLC
00:14:E5 Alticast
00:14:E6 AimInfra # AIM Infrarotmodule GmbH
00:14:E7 Stolinx # Stolinx,. Inc
@@ -14768,6 +14768,27 @@
00:50:C2:FC:80:00/36 FarSouth # Far South Networks
00:50:C2:FC:90:00/36 MehtaTec # Mehta Tech, Inc.
00:50:C2:FC:A0:00/36 Telemisi # Telemisis Ltd
+00:50:C2:FC:B0:00/36 Propagat # Propagation Systems Limited
+00:50:C2:FC:C0:00/36 Soudroni # Soudronic AG
+00:50:C2:FC:D0:00/36 Jinyoung # Jinyoung Contech
+00:50:C2:FC:E0:00/36 KoyoElec # KOYO ELECTRIC
+00:50:C2:FC:F0:00/36 DintekSh # DINTEK Shanghai Electronic Ltd
+00:50:C2:FD:00:00/36 SimpleSo # Simple Solutions
+00:50:C2:FD:10:00/36 EnyxSa # Enyx SA
+00:50:C2:FD:20:00/36 Autonomi # Autonomic Controls. Inc
+00:50:C2:FD:30:00/36 AsterEle # Aster Electric Co.,Ltd.
+00:50:C2:FD:40:00/36 Insitu # Insitu Inc
+00:50:C2:FD:50:00/36 American # American Microsystems, Ltd.
+00:50:C2:FD:60:00/36 CityComp # City Computing Ltd
+00:50:C2:FD:70:00/36 Deuta-We # Deuta-Werke GmbH
+00:50:C2:FD:80:00/36 Ease # Ease Inc.
+00:50:C2:FD:90:00/36 FigmentD # Figment Design Laboratories
+00:50:C2:FD:A0:00/36 Elan # ELAN SYSTEMS
+00:50:C2:FD:B0:00/36 Security # The Security Center Inc
+00:50:C2:FD:C0:00/36 QuercusT # QUERCUS TECHNOLOGIES, S.L.
+00:50:C2:FD:D0:00/36 Toptech # Toptech Systems, Inc.
+00:50:C2:FD:E0:00/36 PeekTraf # Peek Traffic
+00:50:C2:FD:F0:00/36 AcdElekt # ACD Elektronik GmbH
00:50:C4 Imd
00:50:C5 AdsTechn # ADS Technologies, Inc
00:50:C6 LoopTele # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
@@ -16816,6 +16837,8 @@
04:F0:21 CompexPt # Compex Systems Pte Ltd
04:F1:7D TaranaWi # Tarana Wireless
04:F4:BC XenaNetw # Xena Networks
+04:F8:C2 Flaircom # Flaircomm Microelectronics, Inc.
+04:FE:31 SamsungE # Samsung Electronics Co.,Ltd
04:FE:7F Cisco # Cisco Systems
04:FF:51 Novamedi # NOVAMEDIA INNOVISION SP. Z O.O.
08:00:01 Computer # COMPUTERVISION CORPORATION
@@ -16998,7 +17021,9 @@
08:A1:2B Shenzhen # ShenZhen EZL Technology Co., Ltd
08:A9:5A Azurewav # Azurewave
08:AC:A5 BenuVide # Benu Video, Inc.
+08:AF:78 TotusSol # Totus Solutions, Inc.
08:B4:CF AbicomIn # Abicom International
+08:B7:38 Lite-OnT # Lite-On Technogy Corp.
08:B7:EC Wireless # Wireless Seismic
08:BB:CC Ak-NordE # AK-NORD EDV VERTRIEBSGES. mbH
08:BE:09 AstrolEl # Astrol Electronic AG
@@ -17008,6 +17033,7 @@
08:D5:C0 SeersTec # Seers Technology Co., Ltd
08:E6:72 JebseeEl # JEBSEE ELECTRONICS CO.,LTD.
08:EA:44 Aerohive # Aerohive Networks, Inc.
+08:EB:ED WorldEli # World Elite Technology Co.,LTD
08:ED:B9 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
08:F2:F4 NetOnePa # Net One Partners Co.,Ltd.
08:F6:F8 GetEngin # GET Engineering
@@ -17044,6 +17070,7 @@
0C:8B:FD IntelCor # Intel Corporate
0C:8D:98 TopEight # TOP EIGHT IND CORP
0C:92:4E RiceLake # Rice Lake Weighing Systems
+0C:93:FB BnsSolut # BNS Solutions
0C:9D:56 ConsortC # Consort Controls Ltd
0C:9E:91 Sankosha # Sankosha Corporation
0C:A1:38 BlinqWir # Blinq Wireless Inc.
@@ -17092,6 +17119,7 @@
10:0C:24 Pomdevic # pomdevices, LLC
10:0D:2F OnlineSe # Online Security Pty. Ltd.
10:0D:32 Embedian # Embedian, Inc.
+10:0D:7F Netgear # NETGEAR INC.,
10:0E:2B NecCasio # NEC CASIO Mobile Communications
10:10:B6 Mccain # McCain Inc
10:12:12 VivoInte # Vivo International Corporation Pty Ltd
@@ -17152,6 +17180,7 @@
10:F9:6F LgElectr # LG Electronics
10:F9:EE Nokia # Nokia Corporation
10:FC:54 ShanyEle # Shany Electronic Co., Ltd.
+10:FE:ED Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
11:00:AA Private
14:07:08 Private
14:07:E0 Abrantix # Abrantix AG
@@ -17172,6 +17201,7 @@
14:4C:1A MaxCommu # Max Communication GmbH
14:54:12 Entis # Entis Co., Ltd.
14:5A:05 Apple # Apple, Inc.
+14:5B:D1 Motorola # Motorola Mobility, Inc.
14:63:08 JabilCir # JABIL CIRCUIT (SHANGHAI) LTD.
14:6A:0B CypressE # Cypress Electronics Limited
14:6E:0A Private
@@ -17195,6 +17225,7 @@
14:D6:4D D-LinkIn # D-Link International
14:D7:6E ConchEle # CONCH ELECTRONIC Co.,Ltd
14:DA:E9 AsustekC # ASUSTek COMPUTER INC.
+14:DB:85 SNetMedi # S NET MEDIA
14:E4:EC MlogicLl # mLogic LLC
14:E6:E4 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
14:EB:33 Bsmedias # BSMediasoft Co., Ltd.
@@ -17270,6 +17301,7 @@
1C:06:56 Idy # IDY Corporation
1C:0B:52 EpicomSA # EPICOM S.A
1C:0F:CF SyproOpt # Sypro Optics GmbH
+1C:11:E1 Wartsila # Wartsila Finland Oy
1C:12:9D IeeePesP # IEEE PES PSRC/SUB
1C:14:48 Motorola # Motorola Mobility, Inc.
1C:17:D3 Cisco # Cisco Systems
@@ -17341,6 +17373,7 @@
20:2C:B7 KongYueE # Kong Yue Electronics & Information Industry (Xinhui) Ltd.
20:37:06 Cisco # Cisco Systems
20:37:BC KuipersE # Kuipers Electronic Engineering BV
+20:3A:07 Cisco
20:40:05 Feno # feno GmbH
20:41:5A SmartehD # Smarteh d.o.o.
20:44:3A Schneide # Schneider Electric Asia Pacific Ltd
@@ -17355,6 +17388,7 @@
20:5B:5E Shenzhen # Shenzhen Wonhe Technology Co., Ltd
20:64:32 SamsungE # SAMSUNG ELECTRO MECHANICS CO.,LTD.
20:67:B1 Pluto # Pluto inc.
+20:68:9D LiteonTe # Liteon Technology Corporation
20:6A:8A WistronI # Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd.
20:6A:FF AtlasEle # Atlas Elektronik UK Limited
20:6F:EC BraemacC # Braemac CA LLC
@@ -17439,6 +17473,7 @@
24:DA:B6 Sistemas # Sistemas de Gesti�n Energ�tica S.A. de C.V.
24:DB:AC HuaweiDe # Huawei Device Co., Ltd
24:DB:AD Shoppert # ShopperTrak RCT Corporation
+24:DE:C6 ArubaNet # Aruba Networks
24:E6:BA JscZavod # JSC Zavod im. Kozitsky
24:EC:99 AskeyCom # Askey Computer Corp
24:EE:3A ChengduY # Chengdu Yingji Electronic Hi-tech Co Ltd
@@ -17484,6 +17519,7 @@
28:9A:4B Steelser # SteelSeries ApS
28:9E:DF DanfossT # Danfoss Turbocor Compressors, Inc
28:A1:86 Enblink
+28:A1:92 GerpSolu # GERP Solution
28:A5:74 MillerEl # Miller Electric Mfg. Co.
28:AF:0A SiriusXm # Sirius XM Radio Inc
28:B0:CC XenyaDOO # Xenya d.o.o.
@@ -17531,6 +17567,7 @@
2C:41:38 Hewlett- # Hewlett-Packard Company
2C:44:01 SamsungE # Samsung Electronics Co.,Ltd
2C:54:2D Cisco # Cisco Systems
+2C:5A:A3 PromateE # PROMATE ELECTRONIC CO.LTD
2C:62:5A FinestSe # Finest Security Systems Co., Ltd
2C:62:89 Regeners # Regenersis (Glenrothes) Ltd
2C:67:FB Shenzhen # ShenZhen Zhengjili Electronics Co., LTD
@@ -17659,6 +17696,7 @@
34:C3:AC SamsungE # Samsung Electronics
34:C6:9A Enecsys # Enecsys Ltd
34:C7:31 AlpsElec # ALPS Electric Co,. Ltd.
+34:C9:9D EidolonC # EIDOLON COMMUNICATIONS TECHNOLOGY CO. LTD.
34:CE:94 ParsecPt # Parsec (Pty) Ltd
34:D0:9B Mobilmax # MobilMAX Technology Inc.
34:D2:C4 RenaPrin # RENA GmbH Print Systeme
@@ -17696,6 +17734,7 @@
38:72:C0 Comtrend
38:83:45 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
38:8A:B7 Panasoni # Panasonic Telecom Co.,Ltd
+38:8E:E7 Fanhatta # Fanhattan LLC
38:91:FB XenoxBv # Xenox Holding BV
38:95:92 BeijingT # Beijing Tendyron Corporation
38:9F:83 OtnNV # OTN Systems N.V.
@@ -17723,6 +17762,7 @@
3C:04:BF Pravis # PRAVIS SYSTEMS Co.Ltd.,
3C:05:AB ProductC # Product Creation Studio
3C:07:54 Apple # Apple, Inc.
+3C:07:71 Sony # Sony Corporation
3C:09:6D Powerhou # Powerhouse Dynamics
3C:0F:C1 KbcNetwo # KBC Networks
3C:10:6F Albahith # ALBAHITH TECHNOLOGIES
@@ -17754,6 +17794,8 @@
3C:75:4A Motorola # Motorola Mobility, Inc.
3C:7D:B1 TexasIns # Texas Instruments
3C:81:D8 Sagemcom # SAGEMCOM SAS
+3C:83:B5 AdvanceV # Advance Vision Electronics Co. Ltd.
+3C:8A:E5 TensunIn # Tensun Information Technology(Hangzhou) Co.,LTD
3C:8B:FE SamsungE # Samsung Electronics
3C:91:57 Hangzhou # Hangzhou Yulong Conmunication Co.,Ltd
3C:91:74 AlongCom # ALONG COMMUNICATION TECHNOLOGY
@@ -17775,6 +17817,7 @@
3C:CE:73 Cisco # Cisco Systems
3C:D0:F8 Apple # Apple, Inc.
3C:D1:6E Telepowe # Telepower Communication Co., Ltd
+3C:D7:DA SkMtekMi # SK Mtek microelectronics(shenzhen)limited
3C:D9:2B Hewlett- # Hewlett-Packard Company
3C:DF:1E Cisco # Cisco Systems
3C:E5:A6 Hangzhou # Hangzhou H3C Technologies Co., Ltd.
@@ -17877,6 +17920,7 @@
44:3E:B2 Deotron # DEOTRON Co., LTD.
44:45:53 Microsoft
44:46:49 DfiDiamo # DFI (Diamond Flower Industries)
+44:4C:0C Apple # Apple Inc
44:4E:1A SamsungE # Samsung Electronics Co.,Ltd
44:4F:5E PanStudi # Pan Studios Co.,Ltd.
44:51:DB Raytheon # Raytheon BBN Technologies
@@ -18038,6 +18082,7 @@
50:05:3D CyweeGro # CyWee Group Ltd
50:0B:32 FoxdaTec # Foxda Technology Industrial(ShenZhen)Co.,LTD
50:0E:6D Trafficc # TrafficCast International
+50:11:EB Silverne # SilverNet Ltd
50:22:67 Pixelink
50:25:2B NethraIm # Nethra Imaging Incorporated
50:26:90 Fujitsu # Fujitsu Limited
@@ -18047,8 +18092,10 @@
50:2D:A2 IntelCor # Intel Corporate
50:2D:F4 PhytecMe # Phytec Messtechnik GmbH
50:2E:CE AsahiEle # Asahi Electronics Co.,Ltd
+50:39:55 CiscoSpv # Cisco SPVTG
50:3D:E5 Cisco # Cisco Systems
50:3F:56 Syncmold # Syncmold Enterprise Corp
+50:46:5D AsustekC # ASUSTek COMPUTER INC.
50:48:EB BeijingH # BEIJING HAIHEJINSHENG NETWORK TECHNOLOGY CO. LTD.
50:4A:5E Masimo # Masimo Corporation
50:56:63 TexasIns # Texas Instruments
@@ -18119,6 +18166,7 @@
54:9A:16 UzushioE # Uzushio Electric Co.,Ltd.
54:9B:12 SamsungE # Samsung Electronics
54:9D:85 Eneracce # EnerAccess inc
+54:A0:4F T-MacTec # t-mac Technologies Ltd
54:A5:1B HuaweiDe # Huawei Device Co., Ltd
54:A9:D4 Minibar # Minibar Systems
54:B6:20 SuhdolE& # SUHDOL E&C Co.Ltd.
@@ -18126,9 +18174,11 @@
54:D0:ED AximComm # AXIM Communications
54:D1:B0 Universa # Universal Laser Systems, Inc
54:D4:6F CiscoSpv # Cisco SPVTG
+54:DF:63 Intrakey # Intrakey technologies GmbH
54:E6:3F Shenzhen # ShenZhen LingKeWeiEr Technology Co., Ltd.
54:E6:FC Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
54:F5:B6 Oriental # ORIENTAL PACIFIC INTERNATIONAL LIMITED
+54:F6:66 Berthold # Berthold Technologies GmbH and Co.KG
54:FD:BF ScheidtB # Scheidt & Bachmann GmbH
56:58:57 AculabPl # Aculab plc audio bridges
58:05:56 Elettron # Elettronica GF S.r.L.
@@ -18165,11 +18215,13 @@
58:76:75 BeijingE # Beijing ECHO Technologies Co.,Ltd
58:7F:C8 S2m
58:87:4C Lite-OnC # LITE-ON CLEAN ENERGY TECHNOLOGY CORP.
+58:87:E2 Shenzhen # Shenzhen Coship Electronics Co., Ltd.
58:8D:09 Cisco # Cisco Systems
58:91:CF IntelCor # Intel Corporate
58:92:0D KineticA # Kinetic Avionics Limited
58:93:96 RuckusWi # Ruckus Wireless
58:94:6B IntelCor # Intel Corporate
+58:94:CF VertexSt # Vertex Standard LMR, Inc.
58:98:35 Technico # Technicolor
58:98:6F Revoluti # Revolution Display
58:A7:6F Id # iD corporation
@@ -18208,6 +18260,7 @@
5C:33:8E AlphaNet # Alpha Networkc Inc.
5C:35:3B CompalBr # Compal Broadband Networks Inc.
5C:35:DA ThereOy # There Corporation Oy
+5C:38:E0 Shanghai # Shanghai Super Electronics Technology Co.,LTD
5C:40:58 Jefferso # Jefferson Audio Video Systems, Inc.
5C:4A:26 EnguityT # Enguity Technology Corp
5C:4C:A9 HuaweiDe # Huawei Device Co., Ltd
@@ -18258,6 +18311,7 @@
60:19:0C Rramac
60:19:29 Voltroni # VOLTRONIC POWER TECHNOLOGY(SHENZHEN) CORP.
60:1D:0F MidniteS # Midnite Solar
+60:21:C0 MurataMa # Murata Manufactuaring Co.,Ltd.
60:2A:54 Cardiote # CardioTek B.V.
60:2A:D0 CiscoSpv # Cisco SPVTG
60:32:F0 MplusTec # Mplus technology
@@ -18297,6 +18351,7 @@
60:B6:06 Phorus
60:B9:33 DeutronE # Deutron Electronics Corp.
60:B9:82 RoVeRLab # RO.VE.R. Laboratories S.p.A.
+60:BC:4C EwmHight # EWM Hightec Welding GmbH
60:C5:47 Apple # Apple, Inc.
60:C9:80 Trymus
60:CB:FB Airscape # AirScape Inc.
@@ -18312,6 +18367,7 @@
60:F2:81 TranwoTe # TRANWO TECHNOLOGY CO., LTD.
60:F2:EF Visionve # VisionVera International Co., Ltd.
60:F3:DA LogicWay # Logic Way GmbH
+60:F4:94 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
60:F5:9C Cru-Data # CRU-Dataport
60:F6:73 Terumo # TERUMO CORPORATION
60:FA:CD Apple # Apple, Inc.
@@ -18408,6 +18464,7 @@
68:12:2D SpecialI # Special Instrument Development Co., Ltd.
68:15:D3 ZakladyE # Zaklady Elektroniki i Mechaniki Precyzyjnej R&G S.A.
68:16:05 AndElect # Systems And Electronic Development FZCO
+68:17:29 IntelCor # Intel Corporate
68:1A:B2 Zte # zte corporation
68:1C:A2 Rosewill # Rosewill Inc.
68:1F:D8 Advanced # Advanced Telemetry
@@ -18431,6 +18488,7 @@
68:85:40 IgiMobil # IGI Mobile, Inc.
68:87:6B InqMobil # INQ Mobile Limited
68:92:34 RuckusWi # Ruckus Wireless
+68:94:23 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
68:96:7B Apple # Apple Inc
68:97:4B Shenzhen # Shenzhen Costar Electronics Co. Ltd.
68:9C:5E AcsipTec # AcSiP Technology Corp.
@@ -18439,6 +18497,7 @@
68:A8:6D Apple # Apple, Inc.
68:AA:D2 Datecs # DATECS LTD.,
68:AB:8A RfIdeas # RF IDeas
+68:AF:13 FuturaMo # Futura Mobility
68:B4:3A Waterfur # WaterFurnace International, Inc.
68:B5:99 Hewlett- # Hewlett-Packard Company
68:B6:FC HitronTe # Hitron Technologies. Inc
@@ -18505,6 +18564,7 @@
6C:DC:6A Promethe # Promethean Limited
6C:E0:B0 Sound4
6C:E4:CE Villiger # Villiger Security Solutions AG
+6C:E8:73 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
6C:E9:07 Nokia # Nokia Corporation
6C:E9:83 Gastron # Gastron Co., LTD.
6C:F0:49 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD.
@@ -18518,6 +18578,7 @@
70:1A:04 LiteonTe # Liteon Tech Corp.
70:1A:ED Advas # ADVAS CO., LTD.
70:23:93 Fos4x # fos4X GmbH
+70:25:26 Alcatel- # Alcatel-Lucent
70:2B:1D E-DomusI # E-Domus International Limited
70:2F:4B Polyvisi # PolyVision Inc.
70:2F:97 AavaMobi # Aava Mobile Oy
@@ -18618,6 +18679,7 @@
74:B0:0C NetworkV # Network Video Technologies, Inc
74:B9:EB FujianJi # Fujian JinQianMao Electronic Technology Co.,Ltd
74:BE:08 AtekProd # ATEK Products, LLC
+74:BF:A1 Hyunteck
74:CD:0C SmithMye # Smith Myers Communications Ltd.
74:CE:56 PacketFo # Packet Force Technology Limited Company
74:D0:DC Ericsson # ERICSSON AB
@@ -18713,8 +18775,10 @@
78:F5:FD HuaweiTe # Huawei Technologies Co., Ltd
78:F7:D0 Silverbr # Silverbrook Research
78:FE:3D JuniperN # Juniper Networks
+7C:01:87 CurtisIn # Curtis Instruments, Inc.
7C:02:BC HansungE # Hansung Electronics Co. LTD
7C:03:4C Sagemcom
+7C:03:D8 Sagemcom # SAGEMCOM SAS
7C:05:1E Rafael # RAFAEL LTD.
7C:08:D9 Shanghai # Shanghai Engineering Research Center for Broadband Technologies and Applications
7C:09:2B Bekey # Bekey A/S
@@ -18757,6 +18821,7 @@
7C:AC:B2 BoschSof # Bosch Software Innovations GmbH
7C:B0:3E Osram # OSRAM AG
7C:B2:1B CiscoSpv # Cisco SPVTG
+7C:B2:32 TclKingH # TCL King High Frequency EI,Co.,LTD
7C:B5:42 AcesTech # ACES Technology
7C:BB:6F CoscoEle # Cosco Electronics Co., Ltd.
7C:BF:B1 Motorola # Motorola Mobility, Inc.
@@ -18798,6 +18863,7 @@
80:2A:FA Germanee # Germaneers GmbH
80:2D:E1 Solarbri # Solarbridge Technologies
80:2E:14 AzetiNet # azeti Networks AG
+80:2F:DE ZurichIn # Zurich Instruments AG
80:34:57 Ot # OT Systems Limited
80:38:FD Leapfrog # LeapFrog Enterprises, Inc.
80:39:E5 Patlite # PATLITE CORPORATION
@@ -18821,6 +18887,7 @@
80:7D:1B Neosyste # Neosystem Co. Ltd.
80:7D:E3 Chongqin # Chongqing Sichuan Instrument Microcircuit Co.LTD.
80:81:A5 Tongqing # TONGQING COMMUNICATION EQUIPMENT (SHENZHEN) Co.,Ltd
+80:82:87 AtcomTec # ATCOM Technology Co.Ltd.
80:86:98 Netronic # Netronics Technologies Inc.
80:91:2A LihRongE # Lih Rong electronic Enterprise Co., Ltd.
80:91:C0 Agilemes # AgileMesh, Inc.
@@ -18851,6 +18918,7 @@
80:FB:06 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
80:FF:A8 Unidis
84:00:D2 SonyEric # Sony Ericsson Mobile Communications AB
+84:0B:2D SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD
84:18:88 JuniperN # Juniper Networks
84:1B:5E Netgear
84:21:41 Shenzhen # Shenzhen Ginwave Technologies Ltd.
@@ -18895,6 +18963,7 @@
84:DF:0C Net2grid # NET2GRID BV
84:EA:99 Vieworks
84:F6:4C CrossPoi # Cross Point BV
+84:FC:FE Apple
88:10:36 PanodicS # Panodic(ShenZhen) Electronics Limted
88:18:AE Tamron # Tamron Co., Ltd
88:20:12 LmiTechn # LMI Technologies
@@ -18951,6 +19020,7 @@
8C:2D:AA Apple # Apple Inc
8C:3C:4A NakayoTe # NAKAYO TELECOMMUNICATIONS,INC.
8C:44:35 Shanghai # Shanghai BroadMobi Communication Technology Co., Ltd.
+8C:4A:EE GigaTms # GIGA TMS INC
8C:4D:EA Cerio # Cerio Corporation
8C:51:05 Shenzhen # Shenzhen ireadygo Information Technology CO.,LTD.
8C:53:F7 A&DEngin # A&D ENGINEERING CO., LTD.
@@ -19061,6 +19131,7 @@
90:B9:7D JohnsonO # Johnson Outdoors Marine Electronics d/b/a Minnkota
90:C1:15 SonyEric # Sony Ericsson Mobile Communications AB
90:CF:15 Nokia # Nokia Corporation
+90:CF:6F Dlogixs # Dlogixs Co Ltd
90:CF:7D QingdaoH # Qingdao Hisense Electric Co.,Ltd.
90:D1:1B PalomarM # Palomar Medical Technologies
90:D7:4F Bookeen
@@ -19155,6 +19226,8 @@
98:4B:4A Motorola # Motorola Mobility Inc.
98:4B:E1 Hewlett- # Hewlett-Packard Company
98:4E:97 Starligh # Starlight Marketing (H. K.) Ltd.
+98:52:B1 SamsungE # Samsung Electronics
+98:57:D3 HonHai-C # HON HAI-CCPBG PRECISION IND.CO.,LTD.
98:58:8A Sysgrati # SYSGRATION Ltd.
98:59:45 TexasIns # Texas Instruments
98:5E:1B Conversd # ConversDigital Co., Ltd.
@@ -19190,6 +19263,7 @@
98:FE:94 Apple # Apple Inc
9C:01:11 Shenzhen # Shenzhen Newabel Electronic Co., Ltd.
9C:02:98 SamsungE # Samsung Electronics Co.,Ltd
+9C:04:73 Tecmobil # Tecmobile (International) Ltd.
9C:06:6E HyteraCo # Hytera Communications Corporation Limited
9C:0D:AC Tymphany # Tymphany HK Limited
9C:18:74 NokiaDan # Nokia Danmark A/S
@@ -19216,6 +19290,7 @@
9C:5E:73 CalibreU # Calibre UK Ltd
9C:61:1D Omni-IdU # Omni-ID USA, Inc.
9C:64:5E HarmanCo # Harman Consumer Group
+9C:66:50 GlodioTe # Glodio Technolies Co.,Ltd Tianjin Branch
9C:6A:BE QeesAps # QEES ApS.
9C:75:14 WildixSr # Wildix srl
9C:77:AA Nadasnv
@@ -19286,6 +19361,7 @@
A0:82:C7 PTI # P.T.I Co.,LTD
A0:86:EC SaehanHi # SAEHAN HITEC Co., Ltd
A0:88:B4 IntelCor # Intel Corporate
+A0:8C:15 GerhardD # Gerhard D. Wempe KG
A0:8C:9B XtremeTe # Xtreme Technologies Corp
A0:90:DE VeedimsL # VEEDIMS,LLC
A0:98:05 OpenvoxC # OpenVox Communication Co Ltd
@@ -19328,6 +19404,7 @@
A4:46:FA AmtranVi # AmTRAN Video Corporation
A4:4B:15 SunCupid # Sun Cupid Technology (HK) LTD
A4:4C:11 Cisco # Cisco Systems
+A4:4E:31 IntelCor # Intel Corporate
A4:50:55 BuswareD # busware.de
A4:52:6F AdbBroad # ADB Broadband Italia
A4:56:1B Mcot # MCOT Corporation
@@ -19460,6 +19537,7 @@
AC:6F:4F Enspert # Enspert Inc
AC:6F:BB TatungTe # TATUNG Technology Inc.
AC:6F:D9 Valueplu # Valueplus Inc.
+AC:72:36 LexkingT # Lexking Technology Co., Ltd.
AC:72:89 IntelCor # Intel Corporate
AC:7A:42 Iconnect # iConnectivity
AC:80:D6 Hexatron # Hexatronic AB
@@ -19500,6 +19578,7 @@
AC:EA:6A GenixInf # GENIX INFOCOMM CO., LTD.
AC:EE:3B 6harmoni # 6harmonics Inc
AC:F0:B2 BeckerEl # Becker Electronics Taiwan Ltd.
+AC:F1:DF D-LinkIn # D-Link International
AC:F9:7E Elesys # ELESYS INC.
B0:12:03 Dynamics # Dynamics Hong Kong Limited
B0:12:66 Futaba-K # Futaba-Kikaku
@@ -19551,7 +19630,9 @@
B0:E8:92 SeikoEps # SEIKO EPSON CORPORATION
B0:E9:7E Advanced # Advanced Micro Peripherals
B0:EC:71 SamsungE # Samsung Electronics Co.,Ltd
+B0:EE:45 Azurewav # AzureWave Technologies, Inc.
B0:F1:BC DhemaxIn # Dhemax Ingenieros Ltda
+B4:00:9C Cablewor # CableWorld Ltd.
B4:01:42 GciScien # GCI Science & Technology Co.,LTD
B4:04:18 Smartchi # Smartchip Integrated Inc.
B4:07:F9 SamsungE # SAMSUNG ELECTRO-MECHANICS
@@ -19630,6 +19711,7 @@
B8:2C:A0 Honeywel # Honeywell HomMed
B8:3A:7B Worldpla # Worldplay (Canada) Inc.
B8:3D:4E Shenzhen # Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch
+B8:3E:59 Roku # Roku, Inc
B8:41:5F Asp # ASP AG
B8:55:10 ZioncomE # Zioncom Electronics (Shenzhen) Ltd.
B8:58:10 Numera # NUMERA, INC.
@@ -19676,6 +19758,7 @@
B8:D0:6F Guangzho # GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE
B8:D4:9D MSevenSy # M Seven System Ltd.
B8:D9:CE SamsungE # Samsung Electronics
+B8:DA:F1 Strahlen # Strahlenschutz- Entwicklungs- und Ausruestungsgesellschaft mbH
B8:DA:F7 Advanced # Advanced Photonics, Inc.
B8:E5:89 PayterBv # Payter BV
B8:E6:25 2wire
@@ -19823,6 +19906,7 @@
C4:3A:9F Siconix # Siconix Inc.
C4:3C:3C CybelecS # CYBELEC SA
C4:3D:C7 Netgear
+C4:45:67 SambonPr # SAMBON PRECISON and ELECTRONICS
C4:46:19 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
C4:4A:D0 Fireflie # FIREFLIES RTLS
C4:4B:44 Omniprin # Omniprint Inc.
@@ -19900,7 +19984,7 @@
C8:84:39 SunriseT # Sunrise Technologies
C8:84:47 Beautifu # Beautiful Enterprise Co., Ltd
C8:87:3B NetOptic # Net Optics
-C8:8B:47 OpticosS # Opticos s.r.l.
+C8:8B:47 Nolangro # Nolangroup S.P.A con Socio Unico
C8:90:3E PaktonTe # Pakton Technologies
C8:93:83 Embedded # Embedded Automation, Inc.
C8:94:D2 JiangsuD # Jiangsu Datang Electronic Products Co., Ltd
@@ -19951,6 +20035,7 @@
CC:18:7B Manzanit # Manzanita Systems, Inc.
CC:1E:FF Metrolog # Metrological Group BV
CC:22:18 Innodigi # InnoDigital Co., Ltd.
+CC:26:2D VerifiLl # Verifi, LLC
CC:34:D7 GewissSP # GEWISS S.P.A.
CC:43:E3 TrumpSA # Trump s.a.
CC:50:1C KvhIndus # KVH Industries, Inc.
@@ -19980,6 +20065,7 @@
CC:A4:62 ArrisGro # ARRIS Group, Inc
CC:AF:78 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
CC:B2:55 D-LinkIn # D-Link International
+CC:B3:F8 FujitsuI # FUJITSU ISOTEC LIMITED
CC:B5:5A Fraunhof # Fraunhofer ITWM
CC:B8:88 AnbSecur # AnB Securite s.a.
CC:B8:F1 EagleKin # EAGLE KINGDOM TECHNOLOGIES LIMITED
@@ -20019,6 +20105,7 @@
D0:31:10 IngenicS # Ingenic Semiconductor Co.,Ltd
D0:37:61 TexasIns # Texas Instruments
D0:4C:C1 Sintrone # SINTRONES Technology Corp.
+D0:51:62 SonyMobi # Sony Mobile Communications AB
D0:54:2D Cambridg # Cambridge Industries(Group) Co.,Ltd.
D0:57:4C Cisco # Cisco Systems
D0:57:85 Pantech # Pantech Co., Ltd.
@@ -20029,6 +20116,7 @@
D0:66:7B SamsungE # Samsung Electronics Co., LTD
D0:67:E5 Dell # Dell Inc
D0:69:9E LuminexL # LUMINEX Lighting Control Equipment
+D0:73:8E DongOhPr # DONG OH PRECISION CO., LTD.
D0:75:BE RenoA&Am # Reno A&E
D0:7D:E5 ForwardP # Forward Pay Systems, Inc.
D0:7E:28 HewlettP # Hewlett Packard
@@ -20083,6 +20171,7 @@
D4:52:97 Nstreams # nSTREAMS Technologies, Inc.
D4:53:AF VigoSyst # VIGO System S.A.
D4:5A:B2 Galleon # Galleon Systems
+D4:5C:70 Wireless # Wireless Gigabit Alliance
D4:5D:42 Nokia # Nokia Corporation
D4:66:A8 RiedoNet # Riedo Networks GmbH
D4:6C:BF Goodrich # Goodrich ISR
@@ -20097,6 +20186,7 @@
D4:8C:B5 Cisco # Cisco Systems
D4:8F:AA SogecamI # Sogecam Industrial, S.A.
D4:91:AF Electroa # Electroacustica General Iberica, S.A.
+D4:93:A0 FidelixO # Fidelix Oy
D4:94:5A Cosmo # COSMO CO., LTD
D4:94:A1 TexasIns # Texas Instruments
D4:96:DF SungjinC # SUNGJIN C&T CO.,LTD
@@ -20128,6 +20218,7 @@
D4:F0:B4 NapcoSec # Napco Security Technologies
D4:F1:43 Iproad # IPROAD.,Inc
D4:F6:3F IeaSRL # IEA S.R.L.
+D8:00:4D Apple
D8:05:2E Skyviia # Skyviia Corporation
D8:06:D1 Honeywel # Honeywell Fire System (Shanghai) Co,. Ltd.
D8:08:F5 ArcadiaN # Arcadia Networks Co. Ltd.
@@ -20329,7 +20420,9 @@
E4:48:C7 CiscoSpv # Cisco SPVTG
E4:4E:18 Gardasof # Gardasoft VisionLimited
E4:4F:29 MaLighti # MA Lighting Technology GmbH
+E4:4F:5F EdsElekt # EDS Elektronik Destek San.Tic.Ltd.Sti
E4:55:EA Dedicate # Dedicated Computing
+E4:56:14 SuttleAp # Suttle Apparatus
E4:64:49 Motorola # Motorola Mobility, Inc.
E4:67:BA DanishIn # Danish Interpretation Systems A/S
E4:6C:21 Messma # messMa GmbH
@@ -20388,7 +20481,9 @@
E8:5E:53 Infratec # Infratec Datentechnik GmbH
E8:6C:DA Supercom # Supercomputers and Neurocomputers Research Center
E8:6D:52 Motorola # Motorola Mobility, Inc.
+E8:6D:54 DigitMob # Digit Mobile Inc
E8:6D:6E ControlD # Control & Display Systems Ltd t/a CDSRail
+E8:71:8D ElsysEqu # Elsys Equipamentos Eletronicos Ltda
E8:75:7F FirsTech # FIRS Technologies(Shenzhen) Co., Ltd
E8:78:A1 BeoviewI # BEOVIEW INTERCOM DOO
E8:7A:F3 S5TechSR # S5 Tech S.r.l.
@@ -20501,6 +20596,7 @@
F0:4B:6A Scientif # Scientific Production Association Siberian Arsenal, Ltd.
F0:4B:F2 JtechCom # JTECH Communications, Inc.
F0:4D:A2 Dell # Dell Inc.
+F0:4F:7C Private
F0:58:49 Careview # CareView Communications
F0:5D:89 Dycon # Dycon Limited
F0:62:0D Shenzhen # Shenzhen Egreat Tech Corp.,Ltd
@@ -20518,6 +20614,7 @@
F0:9C:E9 Aerohive # Aerohive Networks Inc
F0:A2:25 Private
F0:A7:64 Gst # GST Co., Ltd.
+F0:AC:A4 Hbc-Radi # HBC-radiomatic
F0:AD:4E Globalsc # Globalscale Technologies, Inc.
F0:AE:51 Xi3 # Xi3 Corp
F0:B4:79 Apple # Apple, Inc.
@@ -20553,6 +20650,7 @@
F4:04:4C Valencet # ValenceTech Limited
F4:0B:93 Research # Research In Motion
F4:0F:9B Wavelink
+F4:1E:26 Simon-Ka # Simon-Kaloi Engineering
F4:1F:0B Yamabish # YAMABISHI Corporation
F4:36:E1 AbilisSa # Abilis Systems SARL
F4:38:14 Shanghai # Shanghai Howell Electronic Co.,Ltd
@@ -20574,6 +20672,7 @@
F4:60:0D Panoptic # Panoptic Technology, Inc
F4:63:49 Diffon # Diffon Corporation
F4:6D:04 AsustekC # ASUSTek COMPUTER INC.
+F4:6D:E2 Zte # zte corporation
F4:73:CA Conversi # Conversion Sound Inc.
F4:76:26 Viltechm # Viltechmeda UAB
F4:7A:CC Solidfir # SolidFire, Inc.
@@ -20640,6 +20739,7 @@
F8:9D:0D ControlT # Control Technology Inc.
F8:A0:3D DinstarT # Dinstar Technologies Co., Ltd.
F8:A9:DE Puissanc # PUISSANCE PLUS
+F8:AA:8A AxviewTe # Axview Technology (Shenzhen) Co.,Ltd
F8:AC:6D Deltenna # Deltenna Ltd
F8:B5:99 Guangzho # Guangzhou CHNAVS Digital Technology Co.,Ltd
F8:C0:01 JuniperN # Juniper Networks
@@ -20656,6 +20756,7 @@
F8:DB:4C PnyTechn # PNY Technologies, INC.
F8:DB:7F Htc # HTC Corporation
F8:DC:7A Variscit # Variscite LTD
+F8:E4:FB Actionte # Actiontec Electronics, Inc
F8:E7:B5 UtechEng # uTech Engenharia e Automa�ao LTDA
F8:E9:68 EgkerKft # Egker Kft.
F8:EA:0A Dipl-Mat # Dipl.-Math. Michael Rauch
@@ -20699,6 +20800,7 @@
FC:8F:C4 Intellig # Intelligent Technology Inc.
FC:94:6C Ubivelox
FC:94:E3 Technico # Technicolor USA Inc.
+FC:99:47 Cisco
FC:A1:3E SamsungE # Samsung Electronics
FC:A8:41 Avaya # Avaya, Inc
FC:AF:6A Conemtec # Conemtech AB
@@ -20716,6 +20818,7 @@
FC:E8:92 Hangzhou # Hangzhou Lancable Technology Co.,Ltd
FC:ED:B9 Arrayent
FC:F1:CD Optex-Fa # OPTEX-FA CO.,LTD.
+FC:F5:28 ZyxelCom # ZyXEL Communications Corporation
FC:F8:AE IntelCor # Intel Corporate
FC:FA:F7 Shanghai # Shanghai Baud Data Communication Co.,Ltd.
FC:FB:FB Cisco # Cisco Systems
@@ -20723,7 +20826,7 @@
#
# Well-known addresses.
#
-# $Id: manuf 43912 2012-07-22 14:34:08Z gerald $
+# $Id: manuf 44452 2012-08-12 14:34:01Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/packaging/macosx/Info.plist
^
|
| @@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>Wireshark</string>
<key>CFBundleGetInfoString</key>
- <string>1.8.1, Copyright 1998-2012 Wireshark Development Team</string>
+ <string>1.8.2, Copyright 1998-2012 Wireshark Development Team</string>
<key>CFBundleIconFile</key>
<string>Wireshark.icns</string>
<key>CFBundleIdentifier</key>
@@ -56,11 +56,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.8.1</string>
+ <string>1.8.2</string>
<key>CFBundleSignature</key>
<string>Wshk</string>
<key>CFBundleVersion</key>
- <string>1.8.1</string>
+ <string>1.8.2</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 1998-2012 Wireshark Developers, GNU General Public License.</string>
<key>LSMinimumSystemVersion</key>
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/packaging/nsis/Makefile.nmake
^
|
| @@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake 43865 2012-07-20 18:00:20Z gerald $
+# $Id: Makefile.nmake 44086 2012-07-27 23:30:58Z gerald $
#
# NSIS is a free packager/installer/uninstaller program for Win32.
# It was originally written for the Winamp package, but various
@@ -69,7 +69,7 @@
AdditionalTasksPage.ini \
WinPcapPage.ini
-UNINSTALL_INSTALLER = ..\..\wireshark-gtk2\uninstall_installer.exe
+UNINSTALL_INSTALLER = $(STAGING_DIR)\uninstall_installer.exe
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS)
@@ -197,14 +197,15 @@
/DHHC_DIR="$(HHC_DIR)"
!ENDIF
-..\..\uninstall.exe : $(NSI)
+$(STAGING_DIR)\uninstall.exe : $(NSI)
rm -f $(UNINSTALL_INSTALLER)
$(MAKENSIS) $(NSIS_FLAGS) uninstall.nsi
$(UNINSTALL_INSTALLER)
+ rm -f $(UNINSTALL_INSTALLER)
-uninstall-exe : ..\..\uninstall.exe
+uninstall-exe : $(STAGING_DIR)\uninstall.exe
-wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake ..\..\uninstall.exe
+wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake $(STAGING_DIR)\uninstall.exe
$(MAKENSIS) $(NSIS_FLAGS) wireshark.nsi
clean:
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/plugins/ethercat/packet-ecatmb.c
^
|
| @@ -1,7 +1,7 @@
/* packet-ecatmb.c
* Routines for EtherCAT packet disassembly
*
- * $Id: packet-ecatmb.c 42583 2012-05-11 18:54:32Z guy $
+ * $Id: packet-ecatmb.c 44389 2012-08-09 17:40:45Z gerald $
*
* Copyright (c) 2007 by Beckhoff Automation GmbH
*
@@ -1144,11 +1144,18 @@
proto_tree *ecat_eoe_macfilter_filtermask_tree;
ecat_eoe_macfilter_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_eoe_macfilter);
- proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_macfiltercount, tvb, offset, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_maskcount, tvb, offset, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_nobroadcasts, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+
+ /* XXX: Is the field containing EoeMacFilterOptionsUnion 4 bytes or 2 bytes ? */
+ /* sizeof EoeMacFilterOptionsUnion = 2 bytes but the code below */
+ /* originally used a field width of 4 bytes. */
+ /* Given the size of the union, the code below was changed to */
+ /* use a field width of 2 bytes. */
+ /* The hf[] entries were also changed to match the union struct */
+ proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_macfiltercount, tvb, offset, /*4*/ 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_maskcount, tvb, offset, /*4*/ 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_nobroadcasts, tvb, offset, /*4*/ 2, ENC_LITTLE_ENDIAN);
options.Options = tvb_get_letohs(tvb, offset);
- offset+=4;
+ offset+=/*4*/ 2;
anItem = proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_filter, tvb, offset, 16*ETHERNET_ADDRESS_LEN, ENC_NA);
ecat_eoe_macfilter_filter_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_eoe_macfilter_filter);
@@ -1489,18 +1496,23 @@
{ "Mac Filter", "ecat_mailbox.eoe.macfilter",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
},
+
+ /* XXX: The following 3 fields may not be specified correctly */
+ /* See related comment above */
{ &hf_ecat_mailbox_eoe_macfilter_macfiltercount,
{ "Mac Filter Count", "ecat_mailbox.eoe.macfilter.macfiltercount",
- FT_UINT8, 16, NULL, 0x0, NULL, HFILL }
+ FT_UINT16, BASE_DEC, NULL, 0xF000, NULL, HFILL }
},
{ &hf_ecat_mailbox_eoe_macfilter_maskcount,
{ "Mac Filter Mask Count", "ecat_mailbox.eoe.macfilter.maskcount",
- FT_UINT8, 16, NULL, 0x0, NULL, HFILL }
+ FT_UINT16, BASE_DEC, NULL, 0x0C00, NULL, HFILL }
},
{ &hf_ecat_mailbox_eoe_macfilter_nobroadcasts,
{ "No Broadcasts", "ecat_mailbox.eoe.macfilter.nobroadcasts",
- FT_BOOLEAN, BASE_NONE, TFS(&flags_set_truth), 0x0, NULL, HFILL }
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x0100, NULL, HFILL }
},
+ /* ... */
+
{ &hf_ecat_mailbox_eoe_macfilter_filter,
{ "Filter", "ecat_mailbox.eoe.macfilter.filter",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/services
^
|
| @@ -1,6 +1,6 @@
# This is a local copy of the IANA port-numbers file.
#
-# $Id: services 43912 2012-07-22 14:34:08Z gerald $
+# $Id: services 44452 2012-08-12 14:34:01Z gerald $
#
# Wireshark uses it to resolve port numbers into human readable
# service names, e.g. TCP port 80 -> http.
@@ -14,7 +14,11 @@
# Service Name and Transport Protocol Port Number Registry
#
# Last Updated
-# 2012-07-19
+# 2012-08-07
+#
+# Experts
+#
+# Joe Touch; Markku Kojo, Eliot Lear, Allison Mankin, Kumiko Ono, Martin Stiemerling
#
# Note
#
@@ -614,8 +618,8 @@
bgp 179/sctp # BGP [Randall_Stewart] [Randall_Stewart] [RFC4960]
ris 180/tcp # Intergraph [Dave_Buehmann] [Dave_Buehmann]
ris 180/udp # Intergraph [Dave_Buehmann] [Dave_Buehmann]
-unify 181/tcp # Unify [Mark_Ainsley] [Mark_Ainsley]
-unify 181/udp # Unify [Mark_Ainsley] [Mark_Ainsley]
+unify 181/tcp # Unify [Daegis_Inc] [Chris_Anderson] 2012-07-31
+unify 181/udp # Unify [Daegis_Inc] [Chris_Anderson] 2012-07-31
audit 182/tcp # Unisys Audit SITP [Gil_Greenbaum] [Gil_Greenbaum]
audit 182/udp # Unisys Audit SITP [Gil_Greenbaum] [Gil_Greenbaum]
ocbinder 183/tcp # OCBinder
@@ -830,7 +834,12 @@
# 270 tcp Reserved
gist 270/udp # Q-mode encapsulation for [RFC5971]
# GIST messages
-# 271-279 Unassigned
+# IETF Network Endpoint
+pt-tls 271/tcp # Assessment (NEA) Posture [IESG] [IETF_Chair] 2012-07-31 [draft-ietf-nea-pt-tls-06] 1 year TEMPORARY Assignment
+# Transport Protocol over TLS
+# (PT-TLS)
+# 271 udp Reserved
+# 272-279 Unassigned
http-mgmt 280/tcp # http-mgmt [Adrian_Pell] [Adrian_Pell]
http-mgmt 280/udp # http-mgmt [Adrian_Pell] [Adrian_Pell]
personal-link 281/tcp # Personal Link [Dan_Cummings] [Dan_Cummings]
@@ -2118,7 +2127,8 @@
blackjack 1025/udp # network blackjack
cap 1026/tcp # Calendar Access Protocol [Doug_Royer] [Doug_Royer] 2010-12-09
cap 1026/udp # Calendar Access Protocol [Doug_Royer] [Doug_Royer] 2010-12-09
-# 1027 Unassigned 2005-09-16
+6a44 1027/udp # IPv6 Behind NAT44 CPEs [IESG] [IETF_Chair] 2012-08-02 [draft-despres-6a44-02]
+# 1027 tcp Reserved
# 1028 Deprecated 2004-02
solid-mux 1029/tcp # Solid Mux Server [Anders_Borg] [Anders_Borg] 2004-11
solid-mux 1029/udp # Solid Mux Server [Anders_Borg] [Anders_Borg] 2004-11
@@ -4246,8 +4256,8 @@
filex-lport 1887/udp # FileX Listening Port [Megan_Woods] [Megan_Woods]
ncconfig 1888/tcp # NC Config Port [Simon_Parker] [Simon_Parker]
ncconfig 1888/udp # NC Config Port [Simon_Parker] [Simon_Parker]
-unify-adapter 1889/tcp # Unify Web Adapter Service [Duane_Gibson] [Duane_Gibson]
-unify-adapter 1889/udp # Unify Web Adapter Service [Duane_Gibson] [Duane_Gibson]
+unify-adapter 1889/tcp # Unify Web Adapter Service [Daegis_Inc] [Chris_Anderson] 2012-07-31
+unify-adapter 1889/udp # Unify Web Adapter Service [Daegis_Inc] [Chris_Anderson] 2012-07-31
wilkenlistener 1890/tcp # wilkenListener [Wilken_GmbH] [Wilken_GmbH]
wilkenlistener 1890/udp # wilkenListener [Wilken_GmbH] [Wilken_GmbH]
childkey-notif 1891/tcp # ChildKey Notification
@@ -6193,8 +6203,8 @@
pwrsevent 2694/udp # pwrsevent [Yoshinobu_Nakamura] [Yoshinobu_Nakamura]
vspread 2695/tcp # VSPREAD [Sumitake_kobayashi] [Sumitake_kobayashi]
vspread 2695/udp # VSPREAD [Sumitake_kobayashi] [Sumitake_kobayashi]
-unifyadmin 2696/tcp # Unify Admin [Duane_Gibson] [Duane_Gibson]
-unifyadmin 2696/udp # Unify Admin [Duane_Gibson] [Duane_Gibson]
+unifyadmin 2696/tcp # Unify Admin [Daegis_Inc] [Chris_Anderson] 2012-07-31
+unifyadmin 2696/udp # Unify Admin [Daegis_Inc] [Chris_Anderson] 2012-07-31
oce-snmp-trap 2697/tcp # Oce SNMP Trap Port [Peter_Teeuwen] [Peter_Teeuwen]
oce-snmp-trap 2697/udp # Oce SNMP Trap Port [Peter_Teeuwen] [Peter_Teeuwen]
mck-ivpip 2698/tcp # MCK-IVPIP [Robert_Vincent] [Robert_Vincent]
@@ -7716,10 +7726,10 @@
# Server
appman-server 3312/udp # Application Management
# Server
-uorb 3313/tcp # Unify Object Broker
-uorb 3313/udp # Unify Object Broker
-uohost 3314/tcp # Unify Object Host [Duane_Gibson] [Duane_Gibson]
-uohost 3314/udp # Unify Object Host [Duane_Gibson] [Duane_Gibson]
+uorb 3313/tcp # Unify Object Broker [Daegis_Inc] [Chris_Anderson] 2012-07-31
+uorb 3313/udp # Unify Object Broker [Daegis_Inc] [Chris_Anderson] 2012-07-31
+uohost 3314/tcp # Unify Object Host [Daegis_Inc] [Chris_Anderson] 2012-07-31
+uohost 3314/udp # Unify Object Host [Daegis_Inc] [Chris_Anderson] 2012-07-31
cdid 3315/tcp # CDID [Andrew_Borisov] [Andrew_Borisov]
cdid 3315/udp # CDID [Andrew_Borisov] [Andrew_Borisov]
aicc-cmi 3316/tcp # AICC/CMI [William_McDonald] [William_McDonald]
@@ -10569,8 +10579,8 @@
derby-repli 4851/tcp # Apache Derby Replication [Jorgen_Loland] [Jorgen_Loland] 2008-02-27
derby-repli 4851/udp # Apache Derby Replication [Jorgen_Loland] [Jorgen_Loland] 2008-02-27
# 4852-4866 Unassigned
-unify-debug 4867/tcp # Unify Debugger [Ron_Kuris] [Ron_Kuris] 2006-05
-unify-debug 4867/udp # Unify Debugger [Ron_Kuris] [Ron_Kuris] 2006-05
+unify-debug 4867/tcp # Unify Debugger [Daegis_Inc] [Chris_Anderson] 2006-05 2012-07-31
+unify-debug 4867/udp # Unify Debugger [Daegis_Inc] [Chris_Anderson] 2006-05 2012-07-31
phrelay 4868/tcp # Photon Relay
phrelay 4868/udp # Photon Relay
phrelaydbg 4869/tcp # Photon Relay Debug [Michael_Hunter] [Michael_Hunter]
@@ -11798,7 +11808,10 @@
# Service
ldss 6087/udp # Local Download Sharing [Clifford_Heath] [Clifford_Heath] 2006-05
# Service
-# 6088-6098 Unassigned
+doglms 6088/tcp # SuperDog License Manager [SafeNet] [Rob_Tao] 2012-07-26
+doglms-notify 6088/udp # SuperDog License Manager [SafeNet] [Rob_Tao] 2012-07-26
+# Notifier
+# 6089-6098 Unassigned
raxa-mgmt 6099/tcp # RAXA Management [Sukanta_Ganguly] [Sukanta_Ganguly]
# 6099 udp Reserved
synchronet-db 6100/tcp # SynchroNet-db [Arne_Haugland] [Arne_Haugland]
@@ -12856,10 +12869,10 @@
ovbus 7501/tcp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes]
ovbus 7501/udp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes]
# 7502-7507 Unassigned
-adcp 7508/tcp # Automation Device [Holger_Sachs] [Holger_Sachs] 2011-05-27
+adcp 7508/tcp # Automation Device [Festo_AG] [Joerg_Ullmann] 2011-05-27 2012-07-26
# Configuration Protocol
# 7508 udp Reserved
-acplt 7509/tcp # ACPLT - process automation [Henning_Mersch] [Henning_Mersch] 2010-12-07
+acplt 7509/tcp # ACPLT - process automation [Chair_for_Process_Control_Engineering] [Ulrich_Epple] 2010-12-07 2012-08-07
# service
# 7509 udp Reserved
ovhpas 7510/tcp # HP OpenView Application [Jeff_Conrad] [Jeff_Conrad]
@@ -13972,8 +13985,12 @@
sapv1 9875/tcp # Session Announcement v1 [RFC2974]
sapv1 9875/udp # Session Announcement v1 [RFC2974]
sd 9876/tcp # Session Director [Van_Jacobson] [Van_Jacobson]
-sd 9876/udp # Session Director [Van_Jacobson] [Van_Jacobson]
-# 9877-9887 Unassigned
+# 9877 Unassigned
+# The KX509 Kerberized Historically, this service has been referred to as
+kca-service 9878/udp # Certificate Issuance [IESG] [IETF_Chair] 2012-07-12 [RFC-hotz-kx509-06] "kca_service", but this service name does not meet the
+# Protocol in Use in 2012 registry requirements.
+# 9878 tcp Reserved
+# 9879-9887 Unassigned
cyborg-systems 9888/tcp # CYBORG Systems [Malcolm_Graham] [Malcolm_Graham]
cyborg-systems 9888/udp # CYBORG Systems [Malcolm_Graham] [Malcolm_Graham]
# Port for Cable network
@@ -17477,6 +17494,8 @@
# [Casper_Stoel] Casper Stoel mailto:cbs&ascinc.com
# [Cedric_Maloux] Cedric Maloux mailto:cedric&allpeers.com 2007-04
# [Chad_Williams] Chad Williams mailto:chad&apple.com
+# [Chair_for_Process_Control_Engineering] The Chair for Process mailto:ks&plt.rwth-aachen.de 2012-08-07
+# Control Engineering
# [Chandar_Venkataraman] Chandar Venkataraman mailto:CVENKATA&us.oracle.com
# [Chaoyi_Lang] Chaoyi Lang mailto:chao-yi_lang&maxtor.com 2006-01
# [Chap_Tippin] Chap Tippin mailto:chad.tippin&jibeinc.com 2003-06
@@ -17510,7 +17529,7 @@
# [Chirag_Desai] Chirag Desai mailto:Chirag_Desai&symantec.com 2006-02
# [Chris_Adamson] Chris Adamson mailto:invalidname&gmail.com
# [Chris_Adkins] Chris Adkins mailto:cadkins&filenet.com 2006-10
-# [Chris_Anderson] Chris Anderson Daegis, Inc. mailto:ianaportmaster&daegis.com 2012-07-12
+# [Chris_Anderson] Chris Anderson Daegis, Inc. mailto:ianaportmaster&daegis.com 2012-07-31
# [Chris_Bertin] Chris Bertin mailto:chris.bertin&hp.com 2009-05-19
# [Chris_Brown] Chris Brown mailto:chrisb&chancery.com
# [Chris_Chiotasso] Chris Chiotasso mailto:cchiotasso&infolibria.com
@@ -17704,7 +17723,7 @@
# [d_b_audiotechnik] d&b audiotechnik mailto:software.support&dbaudio.com 2011-10-06
# [D_J_Bernstein] D. J. Bernstein mailto:djb&silverton.berkeley.edu
# [D_J_Bernstein_2] D. J. Bernstein mailto:djb&koobera.math.uic.edu
-# [Daegis_Inc] Daegis, Inc. mailto:ianaportmaster&daegis.com 2012-07-12
+# [Daegis_Inc] Daegis, Inc. mailto:ianaportmaster&daegis.com 2012-07-31
# [Dagfinn_Saether] Dagfinn Saether mailto:Dagfinn&admins.com
# [Daisuke_Shinomiya] Daisuke Shinomiya mailto:shinomiya.daisu&jp.fujitsu.com 2005-08
# [Daivd_P_Chassin] Daivd P. Chassin mailto:david.chassin&pnl.gov 2002-06
@@ -18244,6 +18263,7 @@
# [Felisa_Ares] Felisa Ares mailto:faa06&tid.es 2003-04
# [Ferdi_Ladeira] Ferdi Ladeira Fraxion Software mailto:f.lad.mail&gmail.com 2012-03-21
# [Ferruccio_Barletta] Ferruccio Barletta mailto:ferruccio.barletta&compaq.com
+# [Festo_AG] Festo AG & Co. KG mailto:Software-Support&de.festo.com 2012-07-26
# [Fieldbus_Foundation] Fieldbus Foundation mailto:dave.glanzer&fieldbus.org 2002-10
# [Filip_Zawadiak] Filip Zawadiak DOMIQ Sp. z o.o. mailto:fzawadiak&domiq.pl 2011-08-29
# [Filippo_Fadda] Filippo Fadda mailto:fadda&osway.com 2003-08
@@ -18576,7 +18596,6 @@
# [Holger_Kruse] Holger Kruse mailto:holger&rebol.net
# [Holger_Lochner] Holger Lochner mailto:holger.lochner&daimler.com 2011-04-06
# [Holger_Reif] Holger Reif mailto:Holger.Reif&prakinf.tu-ilmenau.de
-# [Holger_Sachs] Holger Sachs mailto:hlsa&de.festo.com 2011-05-27
# [Hong_Jungkih] Hong, Jungkih mailto:jungkih.hong&samsung.com 2010-09-20
# [Horizon_Digital_Ente] Horizon Digital mailto:info&hde.co.jp
# Enterprise Inc.
@@ -18957,6 +18976,7 @@
# [Joerg_Niehoff] Joerg Niehoff mailto:joerg.niehoff&alcatel-ke.de
# [Joerg_Paulus] Joerg Paulus mailto:tech&nicetec.de
# [Joerg_Schneider] Joerg Schneider mailto:joerg.s.schneider&daimler.com 2011-01-26
+# [Joerg_Ullmann] Joerg Ullmann Festo AG & Co. KG mailto:jgu&de.festo.com 2012-07-26
# [Johan_Deleu] Johan Deleu mailto:johan.deleu&alcatel.be 2002-02
# [Johan_Eriksson] Johan Eriksson mailto:johan&marimba.com 2002-04
# [Johan_Kool] Johan Kool mailto:johan&koolistov.net
@@ -20470,6 +20490,7 @@
# LLC
# [Rob_Robertson] Rob Robertson mailto:rob&gangrene.berkeley.edu
# [Rob_Scott] Rob Scott mailto:rscott&rs.com 2007-05
+# [Rob_Tao] Rob Tao SafeNet mailto:rtao&safenet-inc.com 2012-07-26
# [Rob_Versluis] Rob Versluis mailto:r.j.versluis&rocrail.net 2011-05-23
# [Rob_Ward] Rob Ward mailto:RobWardµsoft.com 2008-05-02
# [Rob_Williams] Rob Williams mailto:rob.williamsµsoft.com 2009-02-17
@@ -20672,6 +20693,7 @@
# [Sabu_Das] Sabu Das mailto:sabud&zicomsecure.com 2003-06
# [Sachin_Desai] Sachin Desai mailto:sachin&clairmail.com
# [Sachin_Sheth] Sachin Sheth Microsoft Corporation mailto:sachinsµsoft.com 2012-06-27
+# [SafeNet] SafeNet mailto:rtao&safenet-inc.com 2012-07-26
# [Sailalong_Software] Sailalong Software mailto:CustomerService&sailalong.com
# [Salvo_Nassisi] Salvo Nassisi mailto:sdtech&tin.it
# [Sam_Borman] Sam Borman mailto:sam_borman&uk.ibm.com
@@ -21301,6 +21323,7 @@
# [Uffe_Harksen] Uffe Harksen mailto:uh&uhcommunications.com 2005-08
# [Ulaganathan_Sriramul] Ulaganathan Sriramulu mailto:ulag&effigent.com
# [Ulli_Horlacher] Ulli Horlacher mailto:framstag&rus.uni-stuttgart.de
+# [Ulrich_Epple] Ulrich Epple mailto:ks&plt.rwth-aachen.de 2012-08-07
# [Ulrich_Kortenkamp] Ulrich Kortenkamp mailto:kortenkamp&cinderella.de 2003-06
# [Ulysses_G_Smith_Jr] Ulysses G. Smith Jr. mailto:ugsmith&cesi.com
# The University
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/svnversion.h
^
|
| @@ -1,2 +1,2 @@
-#define SVNVERSION "SVN Rev 43946"
+#define SVNVERSION "SVN Rev 44520"
#define SVNPATH "/trunk-1.8"
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/ui/gtk/capture_dlg.c
^
|
| @@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c 43053 2012-06-04 03:15:05Z guy $
+ * $Id: capture_dlg.c 44409 2012-08-09 23:44:52Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -2679,7 +2679,8 @@
device.buffer = 1;
#endif
device.active_dlt = -1;
- device.if_info.name = NULL;
+ device.locked = FALSE;
+ device.if_info.name = g_strdup(g_save_file);
device.if_info.description = NULL;
device.if_info.addrs = NULL;
device.if_info.loopback = FALSE;
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/ui/gtk/main.c
^
|
| @@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c 43842 2012-07-20 00:45:59Z gerald $
+ * $Id: main.c 44410 2012-08-10 00:08:03Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -249,9 +249,8 @@
/* Match selected byte pattern */
static void
-match_selected_cb_do(gpointer data, int action, gchar *text)
+match_selected_cb_do(GtkWidget *filter_te, gpointer data, int action, gchar *text)
{
- GtkWidget *filter_te;
char *cur_filter, *new_filter;
if ((!text) || (0 == strlen(text))) {
@@ -260,7 +259,6 @@
}
g_assert(data);
- filter_te = g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY);
g_assert(filter_te);
cur_filter = gtk_editable_get_chars(GTK_EDITABLE(filter_te), 0, -1);
@@ -332,14 +330,14 @@
}
void
-match_selected_ptree_cb(GtkWidget *w, gpointer data, MATCH_SELECTED_E action)
+match_selected_ptree_cb(gpointer data, MATCH_SELECTED_E action)
{
char *filter = NULL;
if (cfile.finfo_selected) {
filter = proto_construct_match_selected_string(cfile.finfo_selected,
cfile.edt);
- match_selected_cb_do((data ? data : w), action, filter);
+ match_selected_cb_do(g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY),data, action, filter);
}
}
@@ -634,9 +632,10 @@
}
void
-match_selected_plist_cb(GtkWidget *w _U_, gpointer data, MATCH_SELECTED_E action)
+match_selected_plist_cb(gpointer data, MATCH_SELECTED_E action)
{
- match_selected_cb_do(data,
+ match_selected_cb_do(g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY),
+ data,
action,
get_filter_from_packet_list_row_and_column(data));
}
@@ -2792,7 +2791,7 @@
print_usage(FALSE);
exit(1);
}
-
+
#ifdef HAVE_LIBPCAP
if (global_capture_opts.all_ifaces->len == 0) {
scan_local_interfaces(&global_capture_opts);
@@ -4091,7 +4090,7 @@
GString *ip_str;
interface_options interface_opts;
gboolean found = FALSE;
-
+
if (capture_opts->all_ifaces->len > 0) {
for (i = (int)capture_opts->all_ifaces->len-1; i >= 0; i--) {
@@ -4146,7 +4145,7 @@
device.selected = FALSE;
if (prefs_is_capture_device_hidden(if_info->name)) {
device.hidden = TRUE;
- }
+ }
device.type = get_interface_type(if_info->name, if_info->description);
cap_settings = capture_get_cap_settings(if_info->name);
caps = capture_get_if_capabilities(if_info->name, cap_settings.monitor_mode, NULL);
@@ -4193,7 +4192,7 @@
#endif
#ifdef HAVE_PCAP_SETSAMPLING
device.remote_opts.sampling_method = capture_opts->default_options.sampling_method;
- device.remote_opts.sampling_param = capture_opts->default_options.sampling_param;
+ device.remote_opts.sampling_param = capture_opts->default_options.sampling_param;
#endif
linktype_count = 0;
device.links = NULL;
@@ -4201,7 +4200,7 @@
#if defined(HAVE_PCAP_CREATE)
device.monitor_mode_enabled = cap_settings.monitor_mode;
device.monitor_mode_supported = caps->can_set_rfmon;
-#endif
+#endif
for (lt_entry = caps->data_link_types; lt_entry != NULL; lt_entry = g_list_next(lt_entry)) {
data_link_info = lt_entry->data;
if (linktype_count == 0) {
@@ -4238,18 +4237,18 @@
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
device.buffer = 1;
#endif
-
+
if (capture_opts->ifaces->len > 0) {
for (j = 0; j < capture_opts->ifaces->len; j++) {
interface_opts = g_array_index(capture_opts->ifaces, interface_options, j);
- if (strcmp(interface_opts.name, device.name) == 0) {
+ if (strcmp(interface_opts.name, device.name) == 0) {
#if defined(HAVE_PCAP_CREATE)
device.buffer = interface_opts.buffer_size;
device.monitor_mode_enabled = interface_opts.monitor_mode;
#endif
device.pmode = interface_opts.promisc_mode;
device.has_snaplen = interface_opts.has_snaplen;
- device.snaplen = interface_opts.snaplen;
+ device.snaplen = interface_opts.snaplen;
device.cfilter = g_strdup(interface_opts.cfilter);
device.active_dlt = interface_opts.linktype;
device.selected = TRUE;
@@ -4267,7 +4266,7 @@
if (caps != NULL) {
free_if_capabilities(caps);
}
-
+
g_string_free(ip_str, TRUE);
count++;
}
@@ -4298,7 +4297,7 @@
#endif
device.pmode = interface_opts.promisc_mode;
device.has_snaplen = interface_opts.has_snaplen;
- device.snaplen = interface_opts.snaplen;
+ device.snaplen = interface_opts.snaplen;
device.cfilter = g_strdup(interface_opts.cfilter);
device.active_dlt = interface_opts.linktype;
device.addresses = NULL;
@@ -4307,6 +4306,10 @@
device.links = NULL;
device.local = TRUE;
device.locked = FALSE;
+ device.if_info.name = g_strdup(interface_opts.name);
+ device.if_info.description = g_strdup(interface_opts.descr);
+ device.if_info.addrs = NULL;
+ device.if_info.loopback = FALSE;
g_array_append_val(capture_opts->all_ifaces, device);
capture_opts->num_selected++;
@@ -4339,7 +4342,7 @@
found = TRUE;
break;
}
- }
+ }
if (!found) {
device.hidden = FALSE;
}
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/ui/gtk/main.h
^
|
| @@ -1,7 +1,7 @@
/* main.h
* Global defines, etc.
*
- * $Id: main.h 43053 2012-06-04 03:15:05Z guy $
+ * $Id: main.h 44410 2012-08-10 00:08:03Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -124,11 +124,10 @@
/** User requested one of "Apply as Filter" or "Prepare a Filter" functions
* by menu or context menu of protocol tree.
*
- * @param widget parent widget
* @param data parent widget
* @param action the function to use
*/
-extern void match_selected_ptree_cb(GtkWidget *widget, gpointer data, MATCH_SELECTED_E action);
+extern void match_selected_ptree_cb(gpointer data, MATCH_SELECTED_E action);
/** "Copy ..." action type. */
typedef enum {
@@ -167,11 +166,10 @@
/** User requested one of "Apply as Filter" or "Prepare a Filter" functions
* by context menu of packet list.
*
- * @param widget parent widget (unused)
* @param data parent widget
* @param action the function to use
*/
-extern void match_selected_plist_cb(GtkWidget *widget, gpointer data, MATCH_SELECTED_E action);
+extern void match_selected_plist_cb(gpointer data, MATCH_SELECTED_E action);
/** User requested "Quit" by menu or toolbar.
*
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/ui/gtk/main_menubar.c
^
|
| @@ -1,7 +1,7 @@
/* main_menubar.c
* Menu routines
*
- * $Id: main_menubar.c 43840 2012-07-20 00:36:09Z gerald $
+ * $Id: main_menubar.c 44430 2012-08-10 17:51:09Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -467,91 +467,6 @@
}
-/*Apply a filter */
-
-static void
-tree_view_menu_apply_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/Selected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW);
-}
-
-static void
-tree_view_menu_apply_not_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/NotSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW);
-}
-
-static void
-tree_view_menu_apply_and_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW);
-}
-
-static void
-tree_view_menu_apply_or_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW);
-}
-
-static void
-tree_view_menu_apply_and_not_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndNotSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW);
-}
-
-static void
-tree_view_menu_apply_or_not_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrNotSelected");
- match_selected_ptree_cb( widget , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW);
-}
-/* Prepare a filter */
-static void
-tree_view_menu_prepare_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/Selected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE);
-}
-
-static void
-tree_view_menu_prepare_not_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/NotSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT);
-}
-
-static void
-tree_view_menu_prepare_and_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND);
-}
-
-static void
-tree_view_menu_prepare_or_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR);
-}
-
-static void
-tree_view_menu_prepare_and_not_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndNotSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT);
-}
-
-static void
-tree_view_menu_prepare_or_not_selected_cb(GtkAction *action _U_, gpointer user_data)
-{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrNotSelected");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR_NOT);
-}
static void
copy_description_cb(GtkAction *action _U_, gpointer user_data)
@@ -572,9 +487,10 @@
}
static void
-copy_as_filter_cb(GtkAction *action _U_, gpointer user_data)
+copy_as_filter_cb(GtkAction *action _U_, gpointer user_data _U_)
{
- match_selected_ptree_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY);
+ /* match_selected_ptree_cb needs the popup_menu_object to get the right object E_DFILTER_TE_KEY */
+ match_selected_ptree_cb( popup_menu_object, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY);
}
static void
@@ -1148,21 +1064,21 @@
" <menuitem name='DisplayFilterMacros' action='/Analyze/DisplayFilterMacros'/>\n"
" <separator/>\n"
" <menuitem name='ApplyasColumn' action='/Analyze/ApplyasColumn'/>\n"
-" <menu name= 'ApplyAsFilter' action='/Analyze/ApplyasFilter'>\n"
-" <menuitem name='Selected' action='/Analyze/ApplyasFilter/Selected'/>\n"
-" <menuitem name='NotSelected' action='/Analyze/ApplyasFilter/NotSelected'/>\n"
-" <menuitem name='AndSelected' action='/Analyze/ApplyasFilter/AndSelected'/>\n"
-" <menuitem name='OrSelected' action='/Analyze/ApplyasFilter/OrSelected'/>\n"
-" <menuitem name='AndNotSelected' action='/Analyze/ApplyasFilter/AndNotSelected'/>\n"
-" <menuitem name='OrNotSelected' action='/Analyze/ApplyasFilter/OrNotSelected'/>\n"
-" </menu>\n"
-" <menu name= 'PrepareaFilter' action='/Analyze/PrepareaFilter'>\n"
-" <menuitem name='Selected' action='/Analyze/PrepareaFilter/Selected'/>\n"
-" <menuitem name='NotSelected' action='/Analyze/PrepareaFilter/NotSelected'/>\n"
-" <menuitem name='AndSelected' action='/Analyze/PrepareaFilter/AndSelected'/>\n"
-" <menuitem name='OrSelected' action='/Analyze/PrepareaFilter/OrSelected'/>\n"
-" <menuitem name='AndNotSelected' action='/Analyze/PrepareaFilter/AndNotSelected'/>\n"
-" <menuitem name='OrNotSelected' action='/Analyze/PrepareaFilter/OrNotSelected'/>\n"
+" <menu name= 'ApplyAsFilter' action='/ApplyasFilter'>\n"
+" <menuitem name='Selected' action='/ApplyasFilter/Selected'/>\n"
+" <menuitem name='NotSelected' action='/ApplyasFilter/Not Selected'/>\n"
+" <menuitem name='AndSelected' action='/ApplyasFilter/AndSelected'/>\n"
+" <menuitem name='OrSelected' action='/ApplyasFilter/OrSelected'/>\n"
+" <menuitem name='AndNotSelected' action='/ApplyasFilter/AndNotSelected'/>\n"
+" <menuitem name='OrNotSelected' action='/ApplyasFilter/OrNotSelected'/>\n"
+" </menu>\n"
+" <menu name= 'PrepareaFilter' action='/PrepareaFilter'>\n"
+" <menuitem name='Selected' action='/PrepareaFilter/Selected'/>\n"
+" <menuitem name='NotSelected' action='/PrepareaFilter/Not Selected'/>\n"
+" <menuitem name='AndSelected' action='/PrepareaFilter/AndSelected'/>\n"
+" <menuitem name='OrSelected' action='/PrepareaFilter/OrSelected'/>\n"
+" <menuitem name='AndNotSelected' action='/PrepareaFilter/AndNotSelected'/>\n"
+" <menuitem name='OrNotSelected' action='/PrepareaFilter/OrNotSelected'/>\n"
" </menu>\n"
" <separator/>\n"
" <menuitem name='EnabledProtocols' action='/Analyze/EnabledProtocols'/>\n"
@@ -1412,6 +1328,25 @@
* GCallback callback; The function to call when the action is activated.
*
*/
+#if 0
+ { "/Analyze/ApplyasFilter", NULL, "Apply as Filter", NULL, NULL, NULL },
+
+ { "/Analyze/ApplyasFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) },
+ { "/Analyze/ApplyasFilter/NotSelected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) },
+ { "/Analyze/ApplyasFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) },
+ { "/Analyze/ApplyasFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) },
+ { "/Analyze/ApplyasFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) },
+ { "/Analyze/ApplyasFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) },
+
+ { "/Analyze/PrepareaFilter", NULL, "Prepare a Filter", NULL, NULL, NULL },
+ { "/Analyze/PrepareaFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) },
+ { "/Analyze/PrepareaFilter/NotSelected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) },
+ { "/Analyze/PrepareaFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) },
+ { "/Analyze/PrepareaFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) },
+ { "/Analyze/PrepareaFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) },
+ { "/Analyze/PrepareaFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) },
+
+#endif
static const GtkActionEntry main_menu_bar_entries[] = {
/* Top level */
{ "/File", NULL, "_File", NULL, NULL, NULL },
@@ -1569,17 +1504,17 @@
{ "/View/CollapseAll", NULL, "Collapse _All", "<control>Left", NULL, G_CALLBACK(collapse_all_cb) },
{ "/View/ColorizeConversation", NULL, "Colorize Conversation",NULL, NULL, NULL },
- { "/View/ColorizeConversation/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(view_menu_color_conv_color1_cb) },
- { "/View/ColorizeConversation/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(view_menu_color_conv_color2_cb) },
- { "/View/ColorizeConversation/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(view_menu_color_conv_color3_cb) },
- { "/View/ColorizeConversation/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(view_menu_color_conv_color4_cb) },
- { "/View/ColorizeConversation/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(view_menu_color_conv_color5_cb) },
- { "/View/ColorizeConversation/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(view_menu_color_conv_color6_cb) },
- { "/View/ColorizeConversation/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(view_menu_color_conv_color7_cb) },
- { "/View/ColorizeConversation/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(view_menu_color_conv_color8_cb) },
- { "/View/ColorizeConversation/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(view_menu_color_conv_color9_cb) },
- { "/View/ColorizeConversation/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(view_menu_color_conv_color10_cb) },
- { "/View/ColorizeConversation/NewColoringRule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(view_menu_color_conv_new_rule_cb) },
+ { "/View/ColorizeConversation/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", "<control>1", NULL, G_CALLBACK(view_menu_color_conv_color1_cb) },
+ { "/View/ColorizeConversation/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", "<control>2", NULL, G_CALLBACK(view_menu_color_conv_color2_cb) },
+ { "/View/ColorizeConversation/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", "<control>3", NULL, G_CALLBACK(view_menu_color_conv_color3_cb) },
+ { "/View/ColorizeConversation/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", "<control>4", NULL, G_CALLBACK(view_menu_color_conv_color4_cb) },
+ { "/View/ColorizeConversation/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", "<control>5", NULL, G_CALLBACK(view_menu_color_conv_color5_cb) },
+ { "/View/ColorizeConversation/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", "<control>6", NULL, G_CALLBACK(view_menu_color_conv_color6_cb) },
+ { "/View/ColorizeConversation/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", "<control>7", NULL, G_CALLBACK(view_menu_color_conv_color7_cb) },
+ { "/View/ColorizeConversation/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", "<control>8", NULL, G_CALLBACK(view_menu_color_conv_color8_cb) },
+ { "/View/ColorizeConversation/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", "<control>9", NULL, G_CALLBACK(view_menu_color_conv_color9_cb) },
+ { "/View/ColorizeConversation/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", "<control>0", NULL, G_CALLBACK(view_menu_color_conv_color10_cb) },
+ { "/View/ColorizeConversation/NewColoringRule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(view_menu_color_conv_new_rule_cb) },
{ "/View/ResetColoring1-10", NULL, "Reset Coloring 1-10", "<control>space", NULL, G_CALLBACK(view_menu_reset_coloring_cb) },
{ "/View/ColoringRules", GTK_STOCK_SELECT_COLOR, "_Coloring Rules...", NULL, NULL, G_CALLBACK(color_display_cb) },
@@ -1615,22 +1550,6 @@
{ "/Analyze/DisplayFilterMacros", NULL, "Display Filter _Macros...", NULL, NULL, G_CALLBACK(macros_dialog_cb) },
{ "/Analyze/ApplyasColumn", NULL, "Apply as Column", NULL, NULL, G_CALLBACK(apply_as_custom_column_cb) },
- { "/Analyze/ApplyasFilter", NULL, "Apply as Filter", NULL, NULL, NULL },
-
- { "/Analyze/ApplyasFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) },
- { "/Analyze/ApplyasFilter/NotSelected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) },
- { "/Analyze/ApplyasFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) },
- { "/Analyze/ApplyasFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) },
- { "/Analyze/ApplyasFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) },
- { "/Analyze/ApplyasFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) },
-
- { "/Analyze/PrepareaFilter", NULL, "Prepare a Filter", NULL, NULL, NULL },
- { "/Analyze/PrepareaFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) },
- { "/Analyze/PrepareaFilter/NotSelected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) },
- { "/Analyze/PrepareaFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) },
- { "/Analyze/PrepareaFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) },
- { "/Analyze/PrepareaFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) },
- { "/Analyze/PrepareaFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) },
{ "/Analyze/EnabledProtocols", WIRESHARK_STOCK_CHECKBOX, "_Enabled Protocols...", "<shift><control>E", NULL, G_CALLBACK(proto_cb) },
{ "/Analyze/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode _As...", NULL, NULL, G_CALLBACK(decode_as_cb) },
@@ -1797,7 +1716,7 @@
{ "/Help/ManualPages", NULL, "ManualPages", NULL, NULL, NULL },
{ "/Help/ManualPages/Wireshark", NULL, "Wireshark", NULL, NULL, G_CALLBACK(help_menu_wireshark_cb) },
{ "/Help/ManualPages/WiresharkFilter", NULL, "Wireshark Filter", NULL, NULL, G_CALLBACK(help_menu_wireshark_flt_cb) },
- { "/Help/ManualPages/TShark", NULL, "Wireshark", NULL, NULL, G_CALLBACK(help_menu_Tshark_cb) },
+ { "/Help/ManualPages/TShark", NULL, "Tshark", NULL, NULL, G_CALLBACK(help_menu_Tshark_cb) },
{ "/Help/ManualPages/RawShark", NULL, "RawShark", NULL, NULL, G_CALLBACK(help_menu_RawShark_cb) },
{ "/Help/ManualPages/Dumpcap", NULL, "Dumpcap", NULL, NULL, G_CALLBACK(help_menu_Dumpcap_cb) },
{ "/Help/ManualPages/Mergecap", NULL, "Mergecap", NULL, NULL, G_CALLBACK(help_menu_Mergecap_cb) },
@@ -1965,75 +1884,173 @@
static void
-packet_list_menu_apply_selected_cb(GtkAction *action _U_, gpointer user_data)
+apply_selected_filter_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */, user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW);
+ const gchar *path = gtk_action_get_accel_path(action);
+ /*g_warning("Accelerator path %s",path+9);*/
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW);
+ }
}
static void
-packet_list_menu_apply_not_selected_cb(GtkAction *action _U_, gpointer user_data)
+apply_not_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW);
+ }
}
static void
-packet_list_menu_apply_and_selected_cb(GtkAction *action _U_, gpointer user_data)
+apply_and_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW);
+ }
}
static void
-packet_list_menu_apply_or_selected_cb(GtkAction *action _U_, gpointer user_data)
+apply_or_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW);
+ }
}
static void
-packet_list_menu_apply_and_not_selected_cb(GtkAction *action _U_, gpointer user_data)
+apply_and_not_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW);
+ }
}
static void
-packet_list_menu_apply_or_not_selected_cb(GtkAction *action _U_, gpointer user_data)
+apply_or_not_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW);
+ }
}
+
/* Prepare a filter */
static void
-packet_list_menu_prepare_selected_cb(GtkAction *action _U_, gpointer user_data)
+prepare_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_REPLACE);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_REPLACE);
+ }
}
static void
-packet_list_menu_prepare_not_selected_cb(GtkAction *action _U_, gpointer user_data)
+prepare_not_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_NOT);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_NOT);
+ }
}
static void
-packet_list_menu_prepare_and_selected_cb(GtkAction *action _U_, gpointer user_data)
+prepare_and_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_AND);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_AND);
+ }
}
static void
-packet_list_menu_prepare_or_selected_cb(GtkAction *action _U_, gpointer user_data)
+prepare_or_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_OR);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_OR);
+ }
}
static void
-packet_list_menu_prepare_and_not_selected_cb(GtkAction *action _U_, gpointer user_data)
+prepare_and_not_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_AND_NOT);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_AND_NOT);
+ }
}
static void
-packet_list_menu_prepare_or_not_selected_cb(GtkAction *action _U_, gpointer user_data)
+prepare_or_not_selected_cb(GtkAction *action, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR_NOT);
+ const gchar *path = gtk_action_get_accel_path(action);
+
+ /* path starts with "<Actions>" */
+ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){
+ /* Use different callbacks depending action path */
+ match_selected_plist_cb(user_data, MATCH_SELECTED_OR_NOT);
+ } else {
+ match_selected_ptree_cb(user_data, MATCH_SELECTED_OR_NOT);
+ }
}
static void
@@ -2421,7 +2438,7 @@
static void
packet_list_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data)
{
- match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY);
+ match_selected_plist_cb(user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY);
}
static void
@@ -2542,10 +2559,10 @@
}
static void
-tree_view_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data)
+tree_view_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data _U_)
{
- GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/Copy/AsFilter");
- match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY);
+ /* match_selected_ptree_cb needs the popup_menu_object to get the right object E_DFILTER_TE_KEY */
+ match_selected_ptree_cb( popup_menu_object, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY);
}
static const char *ui_desc_packet_list_heading_menu_popup =
@@ -2606,21 +2623,21 @@
" <separator/>\n"
" <menuitem name='ManuallyResolveAddress' action='/ManuallyResolveAddress'/>\n"
" <separator/>\n"
-" <menu name= 'ApplyAsFilter' action='/Apply as Filter'>\n"
-" <menuitem name='Selected' action='/Apply as Filter/Selected'/>\n"
-" <menuitem name='NotSelected' action='/Apply as Filter/Not Selected'/>\n"
-" <menuitem name='AndSelected' action='/Apply as Filter/AndSelected'/>\n"
-" <menuitem name='OrSelected' action='/Apply as Filter/OrSelected'/>\n"
-" <menuitem name='AndNotSelected' action='/Apply as Filter/AndNotSelected'/>\n"
-" <menuitem name='OrNotSelected' action='/Apply as Filter/OrNotSelected'/>\n"
+" <menu name= 'ApplyAsFilter' action='/ApplyasFilter'>\n"
+" <menuitem name='Selected' action='/ApplyasFilter/Selected'/>\n"
+" <menuitem name='NotSelected' action='/ApplyasFilter/Not Selected'/>\n"
+" <menuitem name='AndSelected' action='/ApplyasFilter/AndSelected'/>\n"
+" <menuitem name='OrSelected' action='/ApplyasFilter/OrSelected'/>\n"
+" <menuitem name='AndNotSelected' action='/ApplyasFilter/AndNotSelected'/>\n"
+" <menuitem name='OrNotSelected' action='/ApplyasFilter/OrNotSelected'/>\n"
" </menu>\n"
-" <menu name= 'PrepareaFilter' action='/Prepare a Filter'>\n"
-" <menuitem name='Selected' action='/Prepare a Filter/Selected'/>\n"
-" <menuitem name='NotSelected' action='/Prepare a Filter/Not Selected'/>\n"
-" <menuitem name='AndSelected' action='/Prepare a Filter/AndSelected'/>\n"
-" <menuitem name='OrSelected' action='/Prepare a Filter/OrSelected'/>\n"
-" <menuitem name='AndNotSelected' action='/Prepare a Filter/AndNotSelected'/>\n"
-" <menuitem name='OrNotSelected' action='/Prepare a Filter/OrNotSelected'/>\n"
+" <menu name= 'PrepareaFilter' action='/PrepareaFilter'>\n"
+" <menuitem name='Selected' action='/PrepareaFilter/Selected'/>\n"
+" <menuitem name='NotSelected' action='/PrepareaFilter/Not Selected'/>\n"
+" <menuitem name='AndSelected' action='/PrepareaFilter/AndSelected'/>\n"
+" <menuitem name='OrSelected' action='/PrepareaFilter/OrSelected'/>\n"
+" <menuitem name='AndNotSelected' action='/PrepareaFilter/AndNotSelected'/>\n"
+" <menuitem name='OrNotSelected' action='/PrepareaFilter/OrNotSelected'/>\n"
" </menu>\n"
" <menu name= 'ConversationFilter' action='/Conversation Filter'>\n"
" <menuitem name='Ethernet' action='/Conversation Filter/Ethernet'/>\n"
@@ -2725,29 +2742,33 @@
" </popup>\n"
"</ui>\n";
+static const GtkActionEntry apply_prepare_filter_action_entries[] = {
+ { "/ApplyasFilter", NULL, "Apply as Filter", NULL, NULL, NULL },
+ { "/ApplyasFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(apply_selected_filter_cb) },
+ { "/ApplyasFilter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(apply_not_selected_cb) },
+ { "/ApplyasFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(apply_and_selected_cb) },
+ { "/ApplyasFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(apply_or_selected_cb) },
+ { "/ApplyasFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(apply_and_not_selected_cb) },
+ { "/ApplyasFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(apply_or_not_selected_cb) },
+
+ { "/PrepareaFilter", NULL, "Prepare a Filter", NULL, NULL, NULL },
+ { "/PrepareaFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(prepare_selected_cb) },
+ { "/PrepareaFilter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(prepare_not_selected_cb) },
+ { "/PrepareaFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(prepare_and_selected_cb) },
+ { "/PrepareaFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(prepare_or_selected_cb) },
+ { "/PrepareaFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(prepare_and_not_selected_cb) },
+ { "/PrepareaFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(prepare_or_not_selected_cb) },
+};
+
+
static const GtkActionEntry packet_list_menu_popup_action_entries[] = {
{ "/MarkPacket", NULL, "Mark Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_mark_frame_cb) },
{ "/IgnorePacket", NULL, "Ignore Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) },
{ "/Set Time Reference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", NULL, NULL, G_CALLBACK(packet_list_menu_set_ref_time_cb) },
{ "/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", NULL, NULL, G_CALLBACK(time_shift_cb) },
{ "/ManuallyResolveAddress", NULL, "Manually Resolve Address", NULL, NULL, G_CALLBACK(manual_addr_resolv_dlg) },
- { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL },
{ "/Edit/AddEditPktComment", WIRESHARK_STOCK_EDIT, "Edit or Add Packet Comment...", NULL, NULL, G_CALLBACK(edit_packet_comment_dlg) },
- { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_apply_selected_cb) },
- { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_not_selected_cb) },
- { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_selected_cb) },
- { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_selected_cb) },
- { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_not_selected_cb) },
- { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_not_selected_cb) },
-
- { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL },
- { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_prepare_selected_cb) },
- { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_not_selected_cb) },
- { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_selected_cb) },
- { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_selected_cb) },
- { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_not_selected_cb) },
- { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_not_selected_cb) },
{ "/Conversation Filter", NULL, "Conversation Filter", NULL, NULL, NULL },
{ "/Conversation Filter/Ethernet", NULL, "Ethernet", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ethernet_cb) },
@@ -2866,21 +2887,21 @@
" <separator/>\n"
" <menuitem name='ApplyasColumn' action='/Apply as Column'/>\n"
" <separator/>\n"
-" <menu name= 'ApplyAsFilter' action='/Apply as Filter'>\n"
-" <menuitem name='Selected' action='/Apply as Filter/Selected'/>\n"
-" <menuitem name='NotSelected' action='/Apply as Filter/Not Selected'/>\n"
-" <menuitem name='AndSelected' action='/Apply as Filter/AndSelected'/>\n"
-" <menuitem name='OrSelected' action='/Apply as Filter/OrSelected'/>\n"
-" <menuitem name='AndNotSelected' action='/Apply as Filter/AndNotSelected'/>\n"
-" <menuitem name='OrNotSelected' action='/Apply as Filter/OrNotSelected'/>\n"
+" <menu name= 'ApplyAsFilter' action='/ApplyasFilter'>\n"
+" <menuitem name='Selected' action='/ApplyasFilter/Selected'/>\n"
+" <menuitem name='NotSelected' action='/ApplyasFilter/Not Selected'/>\n"
+" <menuitem name='AndSelected' action='/ApplyasFilter/AndSelected'/>\n"
+" <menuitem name='OrSelected' action='/ApplyasFilter/OrSelected'/>\n"
+" <menuitem name='AndNotSelected' action='/ApplyasFilter/AndNotSelected'/>\n"
+" <menuitem name='OrNotSelected' action='/ApplyasFilter/OrNotSelected'/>\n"
" </menu>\n"
-" <menu name= 'PrepareaFilter' action='/Prepare a Filter'>\n"
-" <menuitem name='Selected' action='/Prepare a Filter/Selected'/>\n"
-" <menuitem name='NotSelected' action='/Prepare a Filter/Not Selected'/>\n"
-" <menuitem name='AndSelected' action='/Prepare a Filter/AndSelected'/>\n"
-" <menuitem name='OrSelected' action='/Prepare a Filter/OrSelected'/>\n"
-" <menuitem name='AndNotSelected' action='/Prepare a Filter/AndNotSelected'/>\n"
-" <menuitem name='OrNotSelected' action='/Prepare a Filter/OrNotSelected'/>\n"
+" <menu name= 'PrepareaFilter' action='/PrepareaFilter'>\n"
+" <menuitem name='Selected' action='/PrepareaFilter/Selected'/>\n"
+" <menuitem name='NotSelected' action='/PrepareaFilter/Not Selected'/>\n"
+" <menuitem name='AndSelected' action='/PrepareaFilter/AndSelected'/>\n"
+" <menuitem name='OrSelected' action='/PrepareaFilter/OrSelected'/>\n"
+" <menuitem name='AndNotSelected' action='/PrepareaFilter/AndNotSelected'/>\n"
+" <menuitem name='OrNotSelected' action='/PrepareaFilter/OrNotSelected'/>\n"
" </menu>\n"
" <menu name= 'ColorizewithFilter' action='/Colorize with Filter'>\n"
" <menuitem name='Color1' action='/Colorize with Filter/Color 1'/>\n"
@@ -2934,22 +2955,6 @@
{ "/ExpandAll", NULL, "Expand All", NULL, NULL, G_CALLBACK(expand_all_cb) },
{ "/CollapseAll", NULL, "Collapse All", NULL, NULL, G_CALLBACK(collapse_all_cb) },
{ "/Apply as Column", NULL, "Apply as Column", NULL, NULL, G_CALLBACK(apply_as_custom_column_cb) },
- { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL },
-
- { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) },
- { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) },
- { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) },
- { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) },
- { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) },
- { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) },
-
- { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL },
- { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) },
- { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) },
- { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) },
- { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) },
- { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) },
- { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) },
{ "/Colorize with Filter", NULL, "Colorize with Filter", NULL, NULL, NULL },
{ "/Colorize with Filter/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color1_cb) },
@@ -3291,6 +3296,12 @@
G_N_ELEMENTS(packet_list_menu_popup_action_entries), /* the number of entries */
popup_menu_object); /* data to pass to the action callbacks */
+ /* Add the filter menu items */
+ gtk_action_group_add_actions (packet_list_action_group, /* the action group */
+ (gpointer)apply_prepare_filter_action_entries, /* an array of action descriptions */
+ G_N_ELEMENTS(apply_prepare_filter_action_entries), /* the number of entries */
+ popup_menu_object); /* data to pass to the action callbacks */
+
ui_manager_packet_list_menu = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager_packet_list_menu,
@@ -3320,6 +3331,13 @@
G_N_ELEMENTS(tree_view_menu_popup_action_entries), /* the number of entries */
popup_menu_object); /* data to pass to the action callbacks */
+ /* Add the filter menu items */
+ gtk_action_group_add_actions (packet_list_details_action_group, /* the action group */
+ (gpointer)apply_prepare_filter_action_entries, /* an array of action descriptions */
+ G_N_ELEMENTS(apply_prepare_filter_action_entries), /* the number of entries */
+ popup_menu_object); /* data to pass to the action callbacks */
+
+
ui_manager_tree_view_menu = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager_tree_view_menu,
@@ -3393,6 +3411,12 @@
G_N_ELEMENTS(main_menu_bar_entries), /* the number of entries */
NULL); /* data to pass to the action callbacks */
+ /* Add the filter menu items */
+ gtk_action_group_add_actions (main_menu_bar_action_group, /* the action group */
+ (gpointer)apply_prepare_filter_action_entries, /* an array of action descriptions */
+ G_N_ELEMENTS(apply_prepare_filter_action_entries), /* the number of entries */
+ popup_menu_object); /* data to pass to the action callbacks */
+
gtk_action_group_add_toggle_actions(main_menu_bar_action_group, /* the action group */
main_menu_bar_toggle_action_entries, /* an array of action descriptions */
G_N_ELEMENTS(main_menu_bar_toggle_action_entries), /* the number of entries */
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/ui/gtk/old-gtk-compat.h
^
|
| @@ -2,7 +2,7 @@
* Definitions to provide some functions that are not present in older
* GTK versions (down to 2.12.0)
*
- * $Id: old-gtk-compat.h 38319 2011-08-03 15:25:57Z etxrab $
+ * $Id: old-gtk-compat.h 44417 2012-08-10 09:28:23Z etxrab $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -20,7 +20,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef OLD_GTK_COMPAT_H
@@ -51,13 +51,20 @@
# define gtk_widget_get_has_window(x) (!GTK_WIDGET_NO_WINDOW(x))
# define gtk_widget_get_visible(x) GTK_WIDGET_VISIBLE(x)
# define gtk_widget_get_state(x) GTK_WIDGET_STATE(x)
-# define gtk_widget_get_allocation(x,y) (*(y) = x->allocation)
+# define gtk_widget_get_allocation(x,y) *(y) = (x)->allocation
+# define gtk_widget_set_allocation(x, y) (x)->allocation = *(y)
# define gtk_widget_get_sensitive(x) GTK_WIDGET_SENSITIVE(x)
# define gtk_widget_is_drawable(x) GDK_IS_DRAWABLE(x)
+# define gtk_widget_set_window(x, y) (x)->window = (y)
+# define gtk_widget_set_can_default(w,y) if(y==TRUE){GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);}else{GTK_WIDGET_UNSET_FLAGS (w, GTK_CAN_DEFAULT);}
+# define gtk_widget_set_can_focus(w,y) if(y==TRUE){GTK_WIDGET_SET_FLAGS (w, GTK_CAN_FOCUS);}else{GTK_WIDGET_UNSET_FLAGS (w, GTK_CAN_FOCUS);}
#endif
#if !GTK_CHECK_VERSION (2, 20, 0)
# define gtk_widget_get_realized(x) GTK_WIDGET_REALIZED(x)
+# define _gtk_widget_set_realized_true(x) GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED)
+#else
+# define _gtk_widget_set_realized_true(x) gtk_widget_set_realized(x, TRUE)
#endif
#if !GTK_CHECK_VERSION (2, 22, 0)
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/wiretap/Makefile.am
^
|
| @@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id: Makefile.am 43946 2012-07-23 19:30:00Z gerald $
+# $Id: Makefile.am 43951 2012-07-24 00:29:04Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -30,7 +30,7 @@
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwiretap_la_LDFLAGS = -version-info 3:0:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 3:2:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
if HAVE_WARNINGS_AS_ERRORS
AM_NON_GENERATED_CFLAGS = -Werror
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/wiretap/Makefile.in
^
|
| @@ -17,7 +17,7 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id: Makefile.am 43946 2012-07-23 19:30:00Z gerald $
+# $Id: Makefile.am 43951 2012-07-24 00:29:04Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -608,7 +608,7 @@
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwiretap_la_LDFLAGS = -version-info 3:0:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 3:2:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
@HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror
INCLUDES = -I$(srcdir)/..
CLEANFILES = \
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/wiretap/pcapng.c
^
|
| @@ -1,6 +1,6 @@
/* pcapng.c
*
- * $Id: pcapng.c 43658 2012-07-11 03:58:12Z guy $
+ * $Id: pcapng.c 44430 2012-08-10 17:51:09Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -2056,6 +2056,35 @@
/* Loop over all IDB:s that appear before any packets */
while (1) {
+ /* peek at next block */
+ /* Try to read the (next) block header */
+ saved_offset = file_tell(wth->fh);
+ errno = WTAP_ERR_CANT_READ;
+ bytes_read = file_read(&bh, sizeof bh, wth->fh);
+ if (bytes_read == 0) {
+ pcapng_debug0("No more IDBs available...");
+ break;
+ }
+ if (bytes_read != sizeof bh) {
+ *err = file_error(wth->fh, err_info);
+ pcapng_debug3("pcapng_open: Check for more IDB:s, file_read() returned %d instead of %u, err = %d.", bytes_read, (unsigned int)sizeof bh, *err);
+ if (*err == 0)
+ *err = WTAP_ERR_SHORT_READ;
+ return -1;
+ }
+
+ /* go back to where we were */
+ file_seek(wth->fh, saved_offset, SEEK_SET, err);
+
+ if (pn.byte_swapped) {
+ bh.block_type = BSWAP32(bh.block_type);
+ }
+
+ pcapng_debug1("pcapng_open: Check for more IDB:s block_type 0x%x", bh.block_type);
+
+ if (bh.block_type != BLOCK_TYPE_IDB) {
+ break; /* No more IDB:s */
+ }
bytes_read = pcapng_read_block(wth->fh, FALSE, &pn, &wblock, err, err_info);
if (bytes_read == 0) {
pcapng_debug0("No more IDBs available...");
@@ -2068,7 +2097,6 @@
*err = WTAP_ERR_SHORT_READ;
return -1;
}
-
int_data.wtap_encap = wblock.data.if_descr.wtap_encap;
int_data.time_units_per_second = wblock.data.if_descr.time_units_per_second;
int_data.link_type = wblock.data.if_descr.link_type;
@@ -2102,42 +2130,10 @@
g_array_append_val(pcapng->interface_data, interface_data);
pcapng->number_of_interfaces++;
+ pcapng->read_idbs = FALSE;
pcapng_debug2("pcapng_open: Read IDB number_of_interfaces %u, wtap_encap %i", wth->number_of_interfaces, int_data.wtap_encap);
-
- /* peek at next block */
- /* Try to read the (next) block header */
- saved_offset = file_tell(wth->fh);
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&bh, sizeof bh, wth->fh);
- if (bytes_read == 0) {
- pcapng_debug0("No more IDBs available...");
- break;
- }
- if (bytes_read != sizeof bh) {
- *err = file_error(wth->fh, err_info);
- pcapng_debug3("pcapng_open: Check for more IDB:s, file_read() returned %d instead of %u, err = %d.", bytes_read, (unsigned int)sizeof bh, *err);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return -1;
- }
-
- /* go back to where we were */
- file_seek(wth->fh, saved_offset, SEEK_SET, err);
-
- if (pn.byte_swapped) {
- bh.block_type = BSWAP32(bh.block_type);
- }
-
- pcapng_debug1("pcapng_open: Check for more IDB:s block_type 0x%x", bh.block_type);
-
- if (bh.block_type != BLOCK_TYPE_IDB) {
- break; /* No more IDB:s */
- }
}
-
- pcapng->read_idbs = FALSE;
-
return 1;
}
@@ -3167,8 +3163,8 @@
}
int_data = g_array_index(wdh->interface_data, wtapng_if_descr_t,
epb.interface_id);
- ts = (((guint64)phdr->ts.secs) * int_data.time_units_per_second) +
- (phdr->ts.nsecs / (1000000000/int_data.time_units_per_second));
+ ts = ((guint64)phdr->ts.secs) * int_data.time_units_per_second +
+ (((guint64)phdr->ts.nsecs) * int_data.time_units_per_second) / 1000000000;
epb.timestamp_high = (guint32)(ts >> 32);
epb.timestamp_low = (guint32)ts;
epb.captured_len = phdr->caplen + phdr_len;
|
|
[-]
[+]
|
Changed |
wireshark-1.8.2.tar.bz2/wiretap/vwr.c
^
|
| @@ -1,7 +1,7 @@
/* vwr.c
* Copyright (c) 2011 by Tom Alexander <talexander@ixiacom.com>
*
- * $Id: vwr.c 42865 2012-05-27 20:40:09Z guy $
+ * $Id: vwr.c 44428 2012-08-10 17:24:23Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -1610,7 +1610,7 @@
int bytes_written = 0; /* bytes output to buf so far */
register int i; /* temps */
register guint8 *s_ptr, *m_ptr; /* stats and MPDU pointers */
- gint16 msdu_length,actual_octets; /* octets in frame */
+ guint16 msdu_length,actual_octets; /* octets in frame */
guint8 flow_seq; /* seqnum */
guint64 s_time = LL_ZERO, e_time = LL_ZERO; /* start/end */
/* times, nsec */
|
