Wireshark-commits: [Wireshark-commits] master 0513b29: Revert "Allow pcapng interface options to be
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 20 Mar 2014 12:25:23 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0513b29b8b61dba15b7f8c23d9304938206e71fb
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0513b29 by Anders Broman (a.broman58@xxxxxxxxx):

    Revert "Allow pcapng interface options to be available to dissectors."
    This patch causes Wireshark/tshark to segfault if the file is reread(open a file and press reload).
    The test suite also fails on 
    2.1.1 Step: Exit status for existing file: "/home/wireshark/builders/trunk/sol10sparc/build/test/captures/dhcp.pcap" must be 0/home/wireshark/builders/trunk/sol10sparc/build/test/suite-clopts.sh: line 149:  6646 Segmentation Fault      (core dumped) $TSHARK -r "${CAPTURE_DIR}dhcp.pcap" > ./testout.txt 2>&1
    
    OSX build bot chokes on
    pcapng.c: In function 'pcapng_destroy_option_value':
    pcapng.c:377: warning: implicit declaration of function 'g_byte_array_unref'
    pcapng.c:379: warning: implicit declaration of function 'g_array_unref'
    pcapng.c: In function 'pcapng_collect_block_option':
    pcapng.c:419: warning: implicit declaration of function 'g_byte_array_new_take'
    pcapng.c:419: warning: initialization makes pointer from integer without a cast
    
    these functions are glib 2.22
    This reverts commit 7b13a3b0f6a5617e0e352f87cc5a20afea226aa8.
    
    Change-Id: Ia82fdb2d08287bc2cd2841e1e941ae68cbc2e009
    Reviewed-on: https://code.wireshark.org/review/749
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  7b13a3b   Allow pcapng interface options to be available to dissectors.
    adds  0513b29   Revert "Allow pcapng interface options to be available to dissectors." This patch causes Wireshark/tshark to segfault if the file is reread(open a file and press reload). The test suite also fails on 2.1.1 Step: Exit status for existing file: "/home/wireshark/builders/trunk/sol10sparc/build/test/captures/dhcp.pcap" must be 0/home/wireshark/builders/trunk/sol10sparc/build/test/suite-clopts.sh: line 149:  6646 Segmentation Fault      (core dumped) $TSHARK -r "${CAPTURE_D [...]


Summary of changes:
 cfile.c          |   23 ++----------
 cfile.h          |    2 --
 epan/epan-int.h  |    2 --
 epan/epan.c      |    9 -----
 epan/epan.h      |    5 ++-
 file.c           |    1 -
 wiretap/pcapng.c |  106 ------------------------------------------------------
 wiretap/wtap.c   |    3 --
 wiretap/wtap.h   |    1 -
 9 files changed, 4 insertions(+), 148 deletions(-)