[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2009/10/23 12:17 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r30502 | krj | 2009-10-11 03:00:01 -0700 (Sun, 11 Oct 2009) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-teamspeak2.c
 
 Switch over to using seasonal memory instead of g_mem_chunkS which are deprecated
 ------------------------------------------------------------------------
 r30505 | krj | 2009-10-11 07:06:56 -0700 (Sun, 11 Oct 2009) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-mgcp.c
 
 Switch over to using seasonal memory since the mgcp dissector was using g_mem_chunks in a seasonal fashion (memory was only freed during file open)
 ------------------------------------------------------------------------
 r30523 | wmeier | 2009-10-11 17:31:37 -0700 (Sun, 11 Oct 2009) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sbus.c
 
 Replace GMemChunks usage with se_alloc();
 Remove unneeded #includes;
 Fix some spacing.
 ------------------------------------------------------------------------
 r30522 | wmeier | 2009-10-11 17:01:59 -0700 (Sun, 11 Oct 2009) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-radius.c
 
 Replace use of GMemChunks by se_alloc();
 @include <stdlib.h> not req'd;
 Use consistent indentation.
 ------------------------------------------------------------------------
 r30524 | guy | 2009-10-11 17:32:34 -0700 (Sun, 11 Oct 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-radius.c
 
 Initialize radius_call, so it's null if we don't pass through the code
 path that sets it.
 ------------------------------------------------------------------------
 r30572 | wmeier | 2009-10-16 07:22:00 -0700 (Fri, 16 Oct 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-isakmp.c
 
 Use GSlice instead of GMemChunks for GLib >= 2.10. Fixes a memory leak.
 ------------------------------------------------------------------------
 
 
 
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r30481 | wmeier | 2009-10-10 14:13:16 -0700 (Sat, 10 Oct 2009) | 19 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ncp.c
    M /trunk/epan/dissectors/packet-ncp2222.inc
 
 Replace use of GMemChunk by se_alloc;
 
 This fixes a major memory leak in the NCP dissector
 caused by the fact that "in recent versions of GLib" (>= 2.10 ?)
 g_mem_chunk_destroy doesn't actually free up the mem_chunk memory.
 
 Note that there still appears to be one or more smaller
 memory leaks somehow associated with NCP dissection.
 
 Example:
 
 A 40M capture file with mostly NCP frames which resulted in a memory
 usage increase of about 20M each time the file was reloaded now results 
 in a 400K-800K memory usage increase each time the file is reloaded.
 
 (If NCP dissection is disabled, there is minimal memory expansion
 each time the file is reloaded).
 ------------------------------------------------------------------------
 r30553 | wmeier | 2009-10-12 14:36:54 -0700 (Mon, 12 Oct 2009) | 3 lines
 Changed paths:
    M /trunk/epan/stream.c
 
 Use se_alloc instead of GMemChunks.
  Fixes memory leak when using GLib v2.10 or later.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                   Action
  +37 -3     packet-isakmp.c        Modified
  +2 -22     packet-mgcp.c          Modified
  +13 -1     packet-ncp.c           Modified
  +19 -75    packet-ncp2222.inc     Modified
  +3 -23     packet-radius.c        Modified
  +19 -27    packet-sbus.c          Modified
  +3 -13     packet-teamspeak2.c    Modified

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

Directory: /trunk-1.2/epan/
  Changes    Path          Action
  +14 -75    stream.c      Modified

Directory: /trunk-1.2/plugins/irda/
  Changes    Path             Action
  +5 -27     packet-irda.c    Modified