Wireshark-commits: [Wireshark-commits] rev 49721: / /trunk-1.10/asn1/c1222/: c1222.asn c1222.cnf /t
From: gerald@xxxxxxxxxxxxx
Date: Mon, 03 Jun 2013 17:44:25 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49721 User: gerald Date: 2013/06/03 10:44 AM Log: Copy over revisions from the trunk: ------------------------------------------------------------------------ r49259 | etxrab | 2013-05-12 11:11:02 -0700 (Sun, 12 May 2013) | 1 line Changed paths: M /trunk/asn1/rrc/packet-rrc-template.c M /trunk/asn1/rrc/rrc.cnf M /trunk/asn1/spnego/packet-spnego-template.c M /trunk/asn1/t38/packet-t38-template.c M /trunk/epan/dissectors/packet-6lowpan.c M /trunk/epan/dissectors/packet-ajp13.c M /trunk/epan/dissectors/packet-arp.c M /trunk/epan/dissectors/packet-beep.c M /trunk/epan/dissectors/packet-brdwlk.c M /trunk/epan/dissectors/packet-catapult-dct2000.c M /trunk/epan/dissectors/packet-cip.c M /trunk/epan/dissectors/packet-cipsafety.c M /trunk/epan/dissectors/packet-dmp.c M /trunk/epan/dissectors/packet-eap.c M /trunk/epan/dissectors/packet-enip.c M /trunk/epan/dissectors/packet-fcp.c M /trunk/epan/dissectors/packet-fp_hint.c M /trunk/epan/dissectors/packet-gssapi.c M /trunk/epan/dissectors/packet-http.c M /trunk/epan/dissectors/packet-iax2.c M /trunk/epan/dissectors/packet-icmpv6.c M /trunk/epan/dissectors/packet-ieee802154.c M /trunk/epan/dissectors/packet-ipx.c M /trunk/epan/dissectors/packet-ixveriwave.c M /trunk/epan/dissectors/packet-k12.c M /trunk/epan/dissectors/packet-lapd.c M /trunk/epan/dissectors/packet-mac-lte-framed.c M /trunk/epan/dissectors/packet-mac-lte.c M /trunk/epan/dissectors/packet-mbtcp.c M /trunk/epan/dissectors/packet-meta.c M /trunk/epan/dissectors/packet-mikey.c M /trunk/epan/dissectors/packet-mp2t.c M /trunk/epan/dissectors/packet-msrp.c M /trunk/epan/dissectors/packet-mysql.c M /trunk/epan/dissectors/packet-ncp2222.inc M /trunk/epan/dissectors/packet-ndps.c M /trunk/epan/dissectors/packet-ntlmssp.c M /trunk/epan/dissectors/packet-ositp.c M /trunk/epan/dissectors/packet-p_mul.c M /trunk/epan/dissectors/packet-pdcp-lte.c M /trunk/epan/dissectors/packet-pop.c M /trunk/epan/dissectors/packet-rdt.c M /trunk/epan/dissectors/packet-rlc-lte.c M /trunk/epan/dissectors/packet-rlc.c M /trunk/epan/dissectors/packet-rohc.c M /trunk/epan/dissectors/packet-rrc.c M /trunk/epan/dissectors/packet-rsync.c M /trunk/epan/dissectors/packet-rtcp.c M /trunk/epan/dissectors/packet-rtp-events.c M /trunk/epan/dissectors/packet-rtp.c M /trunk/epan/dissectors/packet-sdp.c M /trunk/epan/dissectors/packet-selfm.c M /trunk/epan/dissectors/packet-ses.c M /trunk/epan/dissectors/packet-sip.c M /trunk/epan/dissectors/packet-smtp.c M /trunk/epan/dissectors/packet-socks.c M /trunk/epan/dissectors/packet-soupbintcp.c M /trunk/epan/dissectors/packet-spice.c M /trunk/epan/dissectors/packet-spnego.c M /trunk/epan/dissectors/packet-sscop.c M /trunk/epan/dissectors/packet-ssl-utils.c M /trunk/epan/dissectors/packet-synphasor.c M /trunk/epan/dissectors/packet-t38.c M /trunk/epan/dissectors/packet-tcp.c M /trunk/epan/dissectors/packet-teamspeak2.c M /trunk/epan/dissectors/packet-umts_fp.c M /trunk/epan/dissectors/packet-umts_mac.c M /trunk/epan/dissectors/packet-vj.c M /trunk/epan/dissectors/packet-vnc.c M /trunk/epan/dissectors/packet-wcp.c M /trunk/epan/dissectors/packet-zbee-aps.c M /trunk/epan/dissectors/packet-zbee-nwk.c M /trunk/epan/dissectors/packet-zbee-security.c M /trunk/epan/frame_data.c M /trunk/epan/frame_data.h M /trunk/tap-rtp-common.c M /trunk/ui/cli/tap-follow.c M /trunk/ui/gtk/follow_ssl.c M /trunk/ui/gtk/voip_calls.c Add the posibillity to use a key for per-packet-data. ------------------------------------------------------------------------ r49434 | etxrab | 2013-05-19 22:33:18 -0700 (Sun, 19 May 2013) | 4 lines Changed paths: M /trunk/epan/prefs.c From Cal Turney: When another profile is selected, its column.hidden preference is ignored. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8696 ------------------------------------------------------------------------ r49554 | morriss | 2013-05-24 08:28:04 -0700 (Fri, 24 May 2013) | 10 lines Changed paths: M /trunk/tshark.c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8714 : If we're not doing dissection (in 2-pass mode) then don't try to mark frames as depended upon: in that case epan has not been initialized so we shouldn't be looking in the edt (and anyway without dissection there won't be any dependent frames). (I'm not convinced there's any reason to run 2-pass mode without dissection, however...) ------------------------------------------------------------------------ r49565 | mmann | 2013-05-24 12:23:36 -0700 (Fri, 24 May 2013) | 3 lines Changed paths: M /trunk/epan/expert.c Ensure most severe is displayed in expert column. Bug 7733 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7733) #BACKPORT ------------------------------------------------------------------------ r49566 | mmann | 2013-05-24 12:40:09 -0700 (Fri, 24 May 2013) | 1 line Changed paths: M /trunk/epan/dissectors/packet-btsdp.c Bluetooth: Highlight correct bytes in some SDP trees (Part 2). Bug 8700 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8700) ------------------------------------------------------------------------ r49546 | pascal | 2013-05-23 13:28:59 -0700 (Thu, 23 May 2013) | 2 lines Changed paths: M /trunk/epan/dissectors/packet-gsm_sms.c Fix computation of TP-User-Data-Length when SMS is coded with GSM 7 bit default alphabet and TP-User-Data-Header field is present ------------------------------------------------------------------------ r49605 | morriss | 2013-05-28 15:33:33 -0700 (Tue, 28 May 2013) | 7 lines Changed paths: M /trunk/epan/dissectors/packet-sccp.c As described in the thread starting with: https://www.wireshark.org/lists/wireshark-dev/201305/msg00207.html The PC and SSN are mandatory for the SCCP "user table" to work. Complain if they are not given. ------------------------------------------------------------------------ r49606 | eapache | 2013-05-28 16:20:44 -0700 (Tue, 28 May 2013) | 6 lines Changed paths: M /trunk/ui/cli/tap-icmpstat.c M /trunk/ui/cli/tap-icmpv6stat.c In ICMP taps, don't use g_slist_insert_sorted (which results in n^2 time on the number of packets). Just prepend to the list, then sort it when we actually need to calculate the statistics. Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8721 ------------------------------------------------------------------------ r49610 | mmann | 2013-05-29 06:50:45 -0700 (Wed, 29 May 2013) | 3 lines Changed paths: M /trunk/ui/gtk/sctp_assoc_analyse.c Bugfix crash when 'SCTP' -> 'Prepare Filter for this Association' has no associations. Bug 8731 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8731) Dialog (wants to) pop up noting no associations, but sctp_set_filter() wants to press on assuming there is an association. Added NULL check to prevent assumption. ------------------------------------------------------------------------ r49623 | morriss | 2013-05-29 15:43:20 -0700 (Wed, 29 May 2013) | 10 lines Changed paths: M /trunk/epan/dissectors/packet-http.c Fix the infinite recursion problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8733 : We can't solely rely on the port in the URI to determine whether we will be recursively called by decode_tcp_ports(). Instead also check the conversation entry too: if we find that we are the subdissector for this conversation (which we might be--without the port being in our list of ports--if we heuristically picked up the conversation or the user did Decode-As), just bail out and dissect the payload as data. ------------------------------------------------------------------------ r49651 | mmann | 2013-05-31 05:54:35 -0700 (Fri, 31 May 2013) | 3 lines Changed paths: M /trunk/epan/dissectors/packet-usb-ccid.c Check USB CCID length to see if subdissectors should be called instead of doing it blindly (which could lead to malformed packets). Bug 8735 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8735) Also minor cleanup of column info. ------------------------------------------------------------------------ r49653 | guy | 2013-05-31 12:00:28 -0700 (Fri, 31 May 2013) | 3 lines Changed paths: M /trunk/epan/dissectors/packet-dcerpc.c Report the operation number in all places where we note that we don't know about a given operation number. ------------------------------------------------------------------------ r49657 | gerald | 2013-05-31 14:40:26 -0700 (Fri, 31 May 2013) | 7 lines Changed paths: M /trunk/epan/addr_resolv.c A /trunk/test/captures/dns+icmp.pcapng.gz A /trunk/test/hosts.custom A /trunk/test/hosts.global A /trunk/test/hosts.personal A /trunk/test/suite-nameres.sh (from /trunk/test/suite-decryption.sh:49638) M /trunk/test/test.sh nameres.hosts_file_handling shouldn't affect loading the profile "hosts" file. That should be loaded no matter what if we have name resolution enabled. Add a name resolution test suite. Currently disabled until I can test it on Windows. ------------------------------------------------------------------------ r49661 | gerald | 2013-05-31 15:32:14 -0700 (Fri, 31 May 2013) | 3 lines Changed paths: M /trunk/test/suite-nameres.sh M /trunk/test/test.sh Fix the name resolution tests so that they run on Windows. Enable them by default. Remove some unused code. ------------------------------------------------------------------------ r49633 | rbalint | 2013-05-30 09:42:32 -0700 (Thu, 30 May 2013) | 3 lines Changed paths: M /trunk/ui/gtk/bytes_view.c Use gtk_widget_register_window() and gtk_widget_unregister_window() instead of deprecated gdk_window_set_user_data() for GTK+ 3 >= 3.8 ------------------------------------------------------------------------ r49655 | rbalint | 2013-05-31 13:57:07 -0700 (Fri, 31 May 2013) | 6 lines Changed paths: M /trunk/ui/gtk/bytes_view.c Don't call gtk_widget_unregister_window() in bytes_view_unrealize() after GTK+ 3.8.0 to prevent double invocation causing crash. This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8604 . The patch is from Jakub Zawadzki. ------------------------------------------------------------------------ r49682 | pascal | 2013-06-01 13:51:14 -0700 (Sat, 01 Jun 2013) | 3 lines Changed paths: M /trunk/asn1/c1222/c1222.cnf M /trunk/epan/dissectors/packet-c1222.c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8744 : Display C12.22 Invocation Id as unsigned integer ------------------------------------------------------------------------ r49684 | pascal | 2013-06-01 16:10:37 -0700 (Sat, 01 Jun 2013) | 3 lines Changed paths: M /trunk/asn1/c1222/c1222.asn M /trunk/asn1/c1222/c1222.cnf M /trunk/epan/dissectors/packet-c1222.c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8745 : Upgrade AP-title ASN.1 description ------------------------------------------------------------------------ r49698 | pascal | 2013-06-02 13:57:48 -0700 (Sun, 02 Jun 2013) | 3 lines Changed paths: M /trunk/epan/dissectors/packet-gsm_sms.c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8756 : Compute the number of septets needed for an alphanumeric address ------------------------------------------------------------------------ Copy over with manual intervention: ------------------------------------------------------------------------ r49313 | etxrab | 2013-05-15 09:50:37 -0700 (Wed, 15 May 2013) | 2 lines Changed paths: M /trunk/epan/dissectors/packet-frame.c M /trunk/epan/frame_data.c M /trunk/epan/frame_data.h M /trunk/epan/packet_info.h - Use the key for comparison of per_proto_data. - Show the number of per-packet-data entries and which protocol has made entries in the frame. ------------------------------------------------------------------------ Directory: /trunk-1.10/asn1/c1222/ Changes Path Action +15 -12 c1222.asn Modified +2 -0 c1222.cnf Modified Directory: /trunk-1.10/test/captures/ Changes Path Action +0 -0 dns+icmp.pcapng.gz Added Directory: /trunk-1.10/ui/cli/ Changes Path Action +1 -1 tap-follow.c Modified +5 -2 tap-icmpstat.c Modified +5 -2 tap-icmpv6stat.c Modified Directory: /trunk-1.10/epan/dissectors/ Changes Path Action +3 -3 packet-6lowpan.c Modified +2 -2 packet-ajp13.c Modified +6 -6 packet-arp.c Modified +3 -3 packet-beep.c Modified +2 -2 packet-brdwlk.c Modified (91 files not shown)
- Prev by Date: [Wireshark-commits] rev 49720: /trunk/epan/dissectors/ /trunk/epan/dissectors/: packet-dns.c
- Next by Date: [Wireshark-commits] rev 49722: /trunk/epan/dissectors/ /trunk/epan/dissectors/: packet-imap.c
- Previous by thread: [Wireshark-commits] rev 49720: /trunk/epan/dissectors/ /trunk/epan/dissectors/: packet-dns.c
- Next by thread: [Wireshark-commits] rev 49722: /trunk/epan/dissectors/ /trunk/epan/dissectors/: packet-imap.c
- Index(es):