Wireshark · Wireshark-commits: [Wireshark-commits] rev 43869: /trunk-1.6/ /trunk-1.6/epan/dissectors/: packet-ethertype.c packet-gs

[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43869

User: gerald
Date: 2012/07/20 12:31 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r43203 | pascal | 2012-06-11 06:54:06 -0700 (Mon, 11 Jun 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-per.c
 
   Use restricted character string decoding for IA5String type
   Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6246
   ------------------------------------------------------------------------
   r43212 | darkjames | 2012-06-11 12:27:57 -0700 (Mon, 11 Jun 2012) | 4 lines
   Changed paths:
      M /trunk/epan/ftypes/ftype-double.c
 
   Fix bug 6917
 
   strtod() is locale-aware, change it to g_ascii_strtod()
   ------------------------------------------------------------------------
   r43214 | pascal | 2012-06-11 13:12:17 -0700 (Mon, 11 Jun 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
 
   From Alexander via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7360 :
   Service handover IE is not correctly dissected
   ------------------------------------------------------------------------
   r43224 | wmeier | 2012-06-12 06:03:05 -0700 (Tue, 12 Jun 2012) | 2 lines
   Changed paths:
      M /trunk/doc/README.developer
 
   Note that calls to "expert" functions should not be under 'if (tree)'.
   ------------------------------------------------------------------------
   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:
 
   ------------------------------------------------------------------------
   r43277 | darkjames | 2012-06-15 16:04:59 -0700 (Fri, 15 Jun 2012) | 5 lines
   Changed paths:
      M /trunk/ui/gtk/main_proto_draw.c
 
   highlight_field: use passed GtkTreeView for proto_tree_draw.
 
   highlight_field() is also called when we open packet in new window and we click some bytes,
   it caused redrawing packet details in *main window* but with protocol tree from (possibly) another frame.
   ------------------------------------------------------------------------
   r43556 | alagoutte | 2012-07-03 05:28:06 -0700 (Tue, 03 Jul 2012) | 10 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
 
   Wireless Frame with subtype 0x1a don't interpret the Association ID (always 0).
 
   Fix :
   proto_tree_add_uint() wasn't changed to proto_tree_add_item()
 
   #BACKPORT
   ------------------------------------------------------------------------
   r43561 | guy | 2012-07-03 13:12:50 -0700 (Tue, 03 Jul 2012) | 18 lines
   Changed paths:
      M /trunk/Makefile.am
 
   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.
 
   Update the comment to reflect that - and to reflect that GTK+ doesn't
   necessarily run atop X11 - while we're at it.
 
   Fixes bug 7427.
 
   #BACKPORT
   ------------------------------------------------------------------------
   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
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438 :
   Do not call tvb_ensure_length_remaining on an empty tvb
   ------------------------------------------------------------------------
   r43850 | jake | 2012-07-19 23:26:35 -0700 (Thu, 19 Jul 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ethertype.c
      M /trunk/epan/etypes.h
 
   Add some relevant ethertypes.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                     Action
  +4 -0      packet-ethertype.c       Modified
  +2 -2      packet-gsm_a_bssmap.c    Modified
  +1 -1      packet-ieee80211.c       Modified
  +42 -82    packet-nfs.c             Modified
  +14 -12    packet-per.c             Modified
  +8 -7      packet-snmp.c            Modified

Directory: /trunk-1.6/doc/
  Changes    Path                Action
  +16 -14    README.developer    Modified

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +45 -0     release-notes.xml    Modified

Directory: /trunk-1.6/epan/
  Changes    Path          Action
  +8 -0      etypes.h      Modified

Directory: /trunk-1.6/epan/ftypes/
  Changes    Path              Action
  +1 -1      ftype-double.c    Modified


(3 files not shown)