op25
/
op25-legacy
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes for wireshark 1.4.3. 

git-svn-id: http://op25.osmocom.org/svn/trunk@244 65a5c917-d112-43f1-993d-58c26a4786be
This commit is contained in:
stevie 2011-01-17 23:05:13 +00:00
parent 6b42da1e45
commit e2262fd410
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wireshark/plugins/p25/README
View File

@ -1,24 +1,24 @@
Development environment setup: P25 CAI Plugin
This works for me. YMMV.
Install wireshark source tree: Install wireshark source tree:
% tar -xjvf /tmp/wireshark-1.2.2.tar.bz2 % tar -xjvf /tmp/wireshark-1.4.3.tar.bz2
Within the wireshark tree, check out p25 plugin from op25: Within the wireshark tree, check out p25 plugin from op25:
% cd wireshark-1.2.2/plugins % cd wireshark-1.4.3/plugins
% svn checkout http://www.sedition.org.au/svn/op25/trunk/wireshark/plugins/p25 % svn checkout http://www.sedition.org.au/svn/op25/trunk/wireshark/plugins/p25
A few small changes need to be made to the wireshark tree outside of the A few small changes need to be made to the wireshark tree outside of the
plugins directory. Apply a patch to accomplish this: plugins directory. Apply a patch to accomplish this:
% cd .. % cd ..
% patch -p1 <../op25/wireshark/patches/wireshark-1.2.2.patch % patch -p1 <../op25/wireshark/patches/wireshark-1.4.3.patch
Update the build tree with these changes and compile: Update the build tree with these changes and compile:
% ./autogen.sh % ./autogen.sh
% ./configure % ./configure
% make % make
Check the wiki (http://www.sedition.org.au/wiki/WireSharkPage) for more details.

8
wireshark/plugins/p25/packet-p25cai.c
View File

@ -1598,7 +1598,7 @@ proto_register_p25cai(void)
static hf_register_info hf[] = { static hf_register_info hf[] = {
{ &hf_p25cai_fs, { &hf_p25cai_fs,
{ "Frame Synchronization", "p25cai.fs", { "Frame Synchronization", "p25cai.fs",
FT_BYTES, BASE_HEX, NULL, 0x0, FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_p25cai_nid, { &hf_p25cai_nid,
@ -1643,7 +1643,7 @@ proto_register_p25cai(void)
}, },
{ &hf_p25cai_mi, { &hf_p25cai_mi,
{ "Message Indicator", "p25cai.mi", { "Message Indicator", "p25cai.mi",
FT_BYTES, BASE_HEX, NULL, 0x0, FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_p25cai_mfid, { &hf_p25cai_mfid,
@ -1723,7 +1723,7 @@ proto_register_p25cai(void)
}, },
{ &hf_p25cai_imbe, { &hf_p25cai_imbe,
{ "Raw IMBE Frame", "p25cai.imbe", { "Raw IMBE Frame", "p25cai.imbe",
FT_BYTES, BASE_HEX, NULL, 0x0, FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_p25cai_lsd, { &hf_p25cai_lsd,
@ -1813,7 +1813,7 @@ proto_register_p25cai(void)
}, },
{ &hf_p25cai_ud, { &hf_p25cai_ud,
{ "User Data", "p25cai.ud", { "User Data", "p25cai.ud",
FT_BYTES, BASE_HEX, NULL, 0x0, FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_p25cai_packet_crc, { &hf_p25cai_packet_crc,