Wireshark-dev: Re: [Wireshark-dev] Patch to epan/dissectors/packet-lapd.c, some-one please appl
Hi Rolf,
It would be nice if we could figure out why these swaps have taken place.
There's also a bug on Q.931 about this (bug 965), which is also not yet
explained by the parties involved.
The patch isn't the problem, it's avoiding a ping pong game what is user
and what is network side.
Thanx,
Jaap
On Mon, 18 Sep 2006, Rolf Fiedler wrote:
> Hi,
>
> I opened bug 1106 in bugzilla, and I attached a patch to fix the bug in
> the same bug-report. I thought that might be the easiest way to get a
> patch applied. But maybe that was the wrong way to do that. So my
> questions are:
> a) what is the correct way to contribute patches?
> b) could someone please have a look at bug 1106 and apply the patch and
> close the bug?
> c) what is needed to get svn commit permissions?
>
> At the moment I build and test on Linux and don't have the proper setup
> to build Win32 installers. So I hope the change will be included in the
> next release.
>
> We have plans to add ASN.1 decoding of some commonly found FACILITY
> messages to the lapd dissector. For that it would be good to have a way
> to commit the changes.
>
> For reference I attach a copy of bug 1106:
> -----------------------------------------------
> packet-lapd.c change on 2006-03-02 (17452) by etxrab swaps SRC/DST for
> the default case
>
> The following change to the code broke (swapped) the Net/User display in
> src/dst columns:
> in rev 15844
> - if (pinfo->p2p_dir == P2P_DIR_SENT) {
> - is_response = cr ? TRUE : FALSE;
> - if(check_col(pinfo->cinfo, COL_RES_DL_DST))
> - col_set_str(pinfo->cinfo, COL_RES_DL_DST,
> "Network");
> - if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
> - col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "User");
>
> after rev 15844
> + else if (pinfo->p2p_dir == P2P_DIR_SENT) {
> + is_response = cr ? FALSE : TRUE;
> + srcname = "Network";
> + dstname = "User";
>
> old src name was user, now src name is Network!
>
> during adding the "we_network" logic for WTAP_ENCAP_LINUX_LAPD to
> properly handle the cases were the probe is on network or user side
>
> SENT and RECV has been swapped for the default case!!!
>
> Please apply the following patch to make the default case operational again
> This applies to all traces generated by Toshiba Routers or EyeSDN USB
> devices.
> To reproduce the bug, simply open a Toshiba Router ISDN Trace with LAPD
> contents and check RX/TX in the Trace file vs. the Network/User labeling.
> Everything works fine before Rev 17452.
>
> thank you,
> Rolf
> ===============
> Index: epan/dissectors/packet-lapd.c
> ===================================================================
> --- epan/dissectors/packet-lapd.c (Revision 19234)
> +++ epan/dissectors/packet-lapd.c (Arbeitskopie)
> @@ -176,12 +176,12 @@
> }
> }
> }
> - else if (pinfo->p2p_dir == P2P_DIR_SENT) {
> + else if (pinfo->p2p_dir == P2P_DIR_RECV) {
> is_response = cr ? FALSE : TRUE;
> srcname = "Network";
> dstname = "User";
> }
> - else if (pinfo->p2p_dir == P2P_DIR_RECV) {
> + else if (pinfo->p2p_dir == P2P_DIR_SENT) {
> is_response = cr ? TRUE : FALSE;
> srcname = "User";
> dstname = "Network";
> _______________________________________________
> Wireshark-dev mailing list
> Wireshark-dev@xxxxxxxxxxxxx
> http://www.wireshark.org/mailman/listinfo/wireshark-dev
>
