Wireshark-commits: [Wireshark-commits] master c0ab12b: netlink-netfilter, nflog: use NFPROTO_xxx in
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: Sun, 21 Aug 2016 14:53:52 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c0ab12b23e5ca3a48d5f42600d1162a57dfdeca2
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

c0ab12b by Peter Wu (peter@xxxxxxxxxxxxx):

    netlink-netfilter,nflog: use NFPROTO_xxx instead of AF_xxx
    
    These constants are mostly overlapping, except for NFPROTO_ARP. A manual
    study of the Linux v4.7 code shows which fields to use and also reveal
    that nflog.family can never be NFPROTO_ARP because (1) bridge traffic
    use NFPROTO_BRIDGE and (2) arptables has no ULOG/NFLOG target.
    
    This patch affects how some family fields are displayed but do not
    affect subdissector calls.
    
    Change-Id: I7cc73a8dcf73fe68c7ccaaa0f3b329fe484c8bfe
    Reviewed-on: https://code.wireshark.org/review/17190
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  9902117   TCPROS - Protocol dissector improvements
    adds  c0ab12b   netlink-netfilter,nflog: use NFPROTO_xxx instead of AF_xxx


Summary of changes:
 epan/dissectors/packet-netlink-netfilter.c |   20 ++++++++++++++++----
 epan/dissectors/packet-netlink.h           |   13 +++++++++++++
 epan/dissectors/packet-nflog.c             |   17 ++++++++++-------
 3 files changed, 39 insertions(+), 11 deletions(-)