[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/03/17 12:14 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r31987 | jake | 2010-02-24 11:05:55 -0800 (Wed, 24 Feb 2010) | 4 lines
 Changed paths:
    M /trunk/gtk/menus.c
 
 Fix for bug 4522:
 Don't offer "Wiki Protocol Page" and "Filter Field Reference" in the 
 context menu when a Text item is selected.
 ------------------------------------------------------------------------
 r32005 | jake | 2010-02-25 09:41:57 -0800 (Thu, 25 Feb 2010) | 3 lines
 Changed paths:
    M /trunk/gtk/main_welcome.c
 
 Fix for bug 2478:
 "Push to test. Release to detonate."
 ------------------------------------------------------------------------
 r32090 | etxrab | 2010-03-03 07:29:38 -0800 (Wed, 03 Mar 2010) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sip.c
 
 Changed to use g_str_hash ()
 sip_hash_func() function seem to not generate unique enough keys
 if load generation tools are used with many thousands users.
 Loading time ~5 min -> 30s
 
 There is a memory leak in the sip_is_packet_resend area as well.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r32081 | etxrab | 2010-03-01 21:44:04 -0800 (Mon, 01 Mar 2010) | 3 lines
 Changed paths:
    M /trunk/asn1/snmp/packet-snmp-template.c
    M /trunk/epan/dissectors/packet-snmp.c
 
 From Luis Ontanon:
 Check for duplicate entries in usmUserTable.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426
 ------------------------------------------------------------------------
 r32112 | stig | 2010-03-04 04:50:18 -0800 (Thu, 04 Mar 2010) | 4 lines
 Changed paths:
    M /trunk/asn1/pres/packet-pres-template.c
    M /trunk/asn1/snmp/packet-snmp-template.c
    M /trunk/epan/dfilter/dfilter-macro.c
    M /trunk/epan/dissectors/packet-http.c
    M /trunk/epan/dissectors/packet-isakmp.c
    M /trunk/epan/dissectors/packet-k12.c
    M /trunk/epan/dissectors/packet-mac-lte.c
    M /trunk/epan/dissectors/packet-pres.c
    M /trunk/epan/dissectors/packet-sccp.c
    M /trunk/epan/dissectors/packet-snmp.c
    M /trunk/epan/dissectors/packet-user_encap.c
    M /trunk/epan/geoip_db.c
    M /trunk/epan/oids.c
    M /trunk/epan/uat-int.h
    M /trunk/epan/uat.c
    M /trunk/epan/uat.h
    M /trunk/epan/uat_load.l
    M /trunk/gtk/uat_gui.c
 
 From LEGO via bug 3459:
 Add a callback to UAT to be called after the table has being updated,
 use it to renew the snmp_ue_cache.
 ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.2/epan/dfilter/
  Changes    Path               Action
  +1 -0      dfilter-macro.c    Modified

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                   Action
  +1 -0      packet-http.c          Modified
  +1 -0      packet-isakmp.c        Modified
  +1 -0      packet-k12.c           Modified
  +1 -0      packet-pres.c          Modified
  +1 -0      packet-sccp.c          Modified
  +9 -3      packet-sip.c           Modified
  +35 -7     packet-snmp.c          Modified
  +1 -0      packet-user_encap.c    Modified

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


(12 files not shown)