Wireshark · Wireshark-commits: [Wireshark-commits] rev 40427: /trunk-1.6/ /trunk-1.6/epan/dissectors/: packet-gopher.c packet-gsm_i

[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/01/10 10:23 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r40423 | alagoutte | 2012-01-10 05:59:27 -0800 (Tue, 10 Jan 2012) | 5 lines
   Changed paths:
      M /trunk/pcapio.c
 
   From Jose Pedro Oliveira  via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6719
   pcapio.c: bug in libpcap_write_interface_description_block
 
   The attached patch fixes a copy_and_paste error in the code of the function libpcap_write_interface_description_block(): strlen(name) instead of strlen(filter).
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r40312 | cmaynard | 2011-12-28 08:36:57 -0800 (Wed, 28 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-bt-dht.c
      M /trunk/epan/dissectors/packet-gopher.c
      M /trunk/epan/dissectors/packet-gsm_ipa.c
      M /trunk/epan/dissectors/packet-meta.c
      M /trunk/epan/dissectors/packet-mux27010.c
      M /trunk/epan/dissectors/packet-nfs.c
      M /trunk/epan/dissectors/packet-rdp.c
      M /trunk/epan/dissectors/packet-sametime.c
      M /trunk/epan/dissectors/packet-ua.c
      M /trunk/epan/dissectors/packet-xtp.c
      M /trunk/plugins/unistim/packet-unistim.c
 
   Fix memory leaks involving tvb_get_string[z]().
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                 Action
  +1 -2      packet-gopher.c      Modified
  +1 -1      packet-gsm_ipa.c     Modified
  +3 -0      packet-meta.c        Modified
  +7 -5      packet-mux27010.c    Modified
  +3 -0      packet-nfs.c         Modified
  +1 -1      packet-sametime.c    Modified
  +1 -0      packet-xtp.c         Modified

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

Directory: /trunk-1.6/epan/
  Changes    Path           Action
  +1 -1      Makefile.am    Modified

Directory: /trunk-1.6/
  Changes    Path          Action
  +2 -2      pcapio.c      Modified


(1 file not shown)