Commit Graph

142 Commits

Author SHA1 Message Date
Guy Harris ce3c4b2370 Get rid of unnecessary casting away of const.
svn path=/trunk/; revision=32024
2010-02-27 01:12:24 +00:00
Martin Mathieson 7b2a3c26e6 Recognise update string for SR failure, and show ueid in MAC if set.
svn path=/trunk/; revision=31916
2010-02-18 21:24:47 +00:00
Stig Bjørlykke c198fc6546 From Didier Gautheron via bug 4419:
se_alloc and ep_alloc never return NULL and se_alloc0 already initialized
data with 0.

svn path=/trunk/; revision=31654
2010-01-25 11:47:39 +00:00
Martin Mathieson 88447bd5cb Add needed offset to 'radio-type' attached to MAC frame.
svn path=/trunk/; revision=31469
2010-01-08 16:08:22 +00:00
Martin Mathieson 9781efbc67 Getting ready to dissect CPRI C&M commands.
svn path=/trunk/; revision=31391
2009-12-29 22:57:10 +00:00
Martin Mathieson 2e3dc7f0f4 Flag errors with expert info.
svn path=/trunk/; revision=30748
2009-10-28 19:00:41 +00:00
Martin Mathieson b712bb0f19 Add a preference to control whether or not comment strings are scanned for oob LTE MAC messages. Scanning them is probably quite slow.
svn path=/trunk/; revision=30713
2009-10-26 16:40:57 +00:00
Martin Mathieson afffcffff9 Add support for displaying/filtering some LTE MAC out-of-band events.
svn path=/trunk/; revision=30711
2009-10-26 15:39:00 +00:00
Martin Mathieson 6dfb4d1f71 Add support for showing/filtering/resaving logged LTE strings.
svn path=/trunk/; revision=30700
2009-10-26 00:04:27 +00:00
Martin Mathieson 261a938bac Show UEId in info column for CCCH frames.
svn path=/trunk/; revision=29892
2009-09-14 10:26:53 +00:00
Kovarththanan Rajaratnam 6fe1060cd1 Don't pass ep_alloc()'ed strings to col_set_str().
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3984

svn path=/trunk/; revision=29726
2009-09-06 04:26:50 +00:00
Bill Meier 94f28dd8f9 (FWIW) One step towards including stdio.h & stdlib.h only when req'd.
svn path=/trunk/; revision=29568
2009-08-26 19:27:49 +00:00
Martin Mathieson 5560cb61c0 Show CRC errors for RARs.
svn path=/trunk/; revision=29548
2009-08-25 11:01:51 +00:00
Martin Mathieson 8760a6b49d Allow s1ap not to be dissected (to avoid seeing errors, possibly due to proprietary variants).
svn path=/trunk/; revision=29420
2009-08-15 01:29:29 +00:00
Martin Mathieson 19d117fb97 Remove calls to check_col(), and stop giving '{' a line of its own.
svn path=/trunk/; revision=29078
2009-07-13 10:55:53 +00:00
Martin Mathieson 47552ea3a4 Add preference for turning off LTE RRC.
svn path=/trunk/; revision=28988
2009-07-07 14:38:14 +00:00
Stig Bjørlykke 0437f102c3 From Kovarththanan Rajaratnam:
More FT_XXX cleanup.

svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Bill Meier 548e468959 Misc dissector cleanup:
- Make some fcns & vars static
- hf[] blurbs: "" and repeated text --> NULL
- Move proto_register & proto_reg_handoff to end of source
- packet-catapult-dct2000: simplify proto_reg_handoff
- Use consistent indentation

svn path=/trunk/; revision=28488
2009-05-26 16:01:12 +00:00
Martin Mathieson 4dda12f0be - add direction filter to PDCP
- fix PDCP fields ("pdcp.*" -> "pdcp-lte.*")
- improve PDCP info column output (to be more like RLC)

svn path=/trunk/; revision=28342
2009-05-13 09:36:42 +00:00
Martin Mathieson ea18cc4095 Enable preference to call LTE RRC for data inside PDCP frames.
svn path=/trunk/; revision=28329
2009-05-11 15:19:51 +00:00
Martin Mathieson 18f0722913 Try to cast away win64 buildbot problem.
svn path=/trunk/; revision=28191
2009-04-28 10:05:56 +00:00
Martin Mathieson 231928b308 Avoid calling strlen() lots of unnecessary times when parsing outhdr values.
svn path=/trunk/; revision=28190
2009-04-28 09:22:35 +00:00
Martin Mathieson c1e9d8244b Try to speed up dissection by using pointers rather than allocating strings. This is safe as the line is in a static buffer throughout the dissection of any given frame.
svn path=/trunk/; revision=28183
2009-04-27 17:44:32 +00:00
Martin Mathieson a931d7a9d5 Try to speed up lookup of LTE mac/rlc/pdcp dissectors
svn path=/trunk/; revision=28085
2009-04-18 08:03:09 +00:00
Bill Meier 808a4e2c3c Define certain fcns as static (if not used externally).
Also: whiule we're at it: 
 - fix hf[] blurbs as appropriate to use NULL;
 - fix some indentation

svn path=/trunk/; revision=27890
2009-03-29 22:16:26 +00:00
Martin Mathieson d1fec1b985 Only report CRC Status when we know it to be valid.
svn path=/trunk/; revision=27841
2009-03-24 17:28:30 +00:00
Martin Mathieson f474eaedd8 Add CRC error flag to frames, and show in stats window.
svn path=/trunk/; revision=27837
2009-03-23 22:16:25 +00:00
Martin Mathieson c3265c9fdf Add a ReTX count (resends being caused by HARQ NACKs).
svn path=/trunk/; revision=27739
2009-03-16 15:39:52 +00:00
Martin Mathieson e6662f6223 Set and use 'plane' more carefully.
svn path=/trunk/; revision=27488
2009-02-20 10:17:52 +00:00
Martin Mathieson 7a96092e54 Call GTPv2 dissector.
svn path=/trunk/; revision=27440
2009-02-12 10:06:23 +00:00
Martin Mathieson 938c049286 Add dissector for LTE PDCP.
This dissector has lots of TODOs, and hasn't really been worked on in a while, but since
a couple of people had been asking about PDCP support I thought I'd check it in now.

svn path=/trunk/; revision=27293
2009-01-26 12:18:32 +00:00
Martin Mathieson 8da2af7630 Get ready to call PDCP LTE dissector (when its cleaned up and added).
svn path=/trunk/; revision=27289
2009-01-23 15:58:33 +00:00
Martin Mathieson 9d39db177d Add RLC LTE dissector.
svn path=/trunk/; revision=27161
2009-01-05 23:18:00 +00:00
Martin Mathieson 1e5ab19726 Fix a typo.
svn path=/trunk/; revision=27149
2009-01-02 20:28:46 +00:00
Martin Mathieson 2137d6b3c6 Use LTE RRC dissector.
svn path=/trunk/; revision=27148
2009-01-02 01:37:55 +00:00
Martin Mathieson 19489d96e4 Call new LTE MAC dissector when find in file.
svn path=/trunk/; revision=27103
2008-12-23 21:22:47 +00:00
Bill Meier c544c20956 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27050
2008-12-18 19:08:49 +00:00
Bill Meier 129145495e remove unnecessary registration of a prefs callback; minor cleanup
svn path=/trunk/; revision=26076
2008-08-25 17:26:26 +00:00
Bill Meier 7aaadd9bec Fix some warnings reported by gcc -Wshadow ...
svn path=/trunk/; revision=25616
2008-06-27 04:52:56 +00:00
Stig Bjørlykke 7036a616a5 Renamed a local variable to avoid name collisions.
svn path=/trunk/; revision=25563
2008-06-23 21:40:40 +00:00
Martin Mathieson d275348e20 Dissect BCH channels (expect control messages only).
svn path=/trunk/; revision=25445
2008-06-12 16:11:16 +00:00
Martin Mathieson 5106a3e5c8 Set release year and month for F7 FP (needed for correct EDCH no-of-subframes field).
svn path=/trunk/; revision=25436
2008-06-06 17:54:59 +00:00
Martin Mathieson acd6d3fb35 - Make FP radio division mode/speed explicit in struct for R7
- Various R7 fixes












svn path=/trunk/; revision=25425
2008-06-04 17:33:48 +00:00
Martin Mathieson 9fbeaf2d28 Enable R7 FP for UDP-based variants.
Correct interpretation of hs-dsch outhdr flag.









svn path=/trunk/; revision=25384
2008-05-27 10:58:15 +00:00
Martin Mathieson ec60070b2c Enable FP R7 support.
This commit adds a header file needed by my PDCP dissector.
(not yet ready to be added).

svn path=/trunk/; revision=25326
2008-05-20 10:08:28 +00:00
Martin Mathieson 0c700edaba Add mapping for s1ap_r8.
svn path=/trunk/; revision=24264
2008-02-03 23:04:04 +00:00
Stig Bjørlykke 15a5557a3d Changed some variable types to make it compile.
svn path=/trunk/; revision=24117
2008-01-16 20:49:50 +00:00
Martin Mathieson 511197bf71 - Display some sctpprim parameters
- Parse sctpprim v3 properly now
- Add wtp protocol name

svn path=/trunk/; revision=24113
2008-01-16 14:19:45 +00:00
Martin Mathieson 8a311e2320 Add "soap" -> "http" mapping.
svn path=/trunk/; revision=23703
2007-12-03 15:47:08 +00:00
Martin Mathieson 2c68e2299a Improve some comments (and test committing from Windows
build). 

svn path=/trunk/; revision=23343
2007-11-02 22:34:18 +00:00
Anders Broman 1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Martin Mathieson ba1f5676e0 Handle IPv6 addresses in ipprim headers.
svn path=/trunk/; revision=23013
2007-09-28 16:17:22 +00:00
Martin Mathieson ef54adff0d Handle tty messages, diameter_r7, sabp
svn path=/trunk/; revision=22890
2007-09-17 16:03:49 +00:00
Martin Mathieson 54a21f0df5 Map "wimax" -> "wimaxasncp"
svn path=/trunk/; revision=22802
2007-09-06 10:50:17 +00:00
Martin Mathieson cd47f86da3 Send free-standing generic XML messages -> xml dissector
svn path=/trunk/; revision=22468
2007-08-08 13:12:15 +00:00
Martin Mathieson ecc4b9ad06 Fix parsing of sctpprim header (v1)
svn path=/trunk/; revision=22290
2007-07-12 17:31:26 +00:00
Martin Mathieson 64ecf611c4 Make timestamp a double to make filtering more useful.
svn path=/trunk/; revision=22243
2007-07-05 09:58:09 +00:00
Martin Mathieson 1d477c802c - Map gre -> IP
- Change a value string value to help an easily-frightened colleague

svn path=/trunk/; revision=22224
2007-06-29 16:16:57 +00:00
Martin Mathieson 0a3ac0f2eb For IPPRIM, try to set UDP/TCP address info so conversation tracking will work.
svn path=/trunk/; revision=22107
2007-06-15 17:21:13 +00:00
Martin Mathieson 7c6ab66d53 Try to fix warning/error.
svn path=/trunk/; revision=22101
2007-06-14 15:17:49 +00:00
Martin Mathieson ef1aa6fe2d Try again!
svn path=/trunk/; revision=22100
2007-06-14 12:43:15 +00:00
Martin Mathieson 34511b8b59 Improve parsing of sctpprim header (variant 1)
svn path=/trunk/; revision=22099
2007-06-14 11:24:37 +00:00
Martin Mathieson ab32895f34 Use new 'unknown' value for dch_crc_present for EDCH channels.
svn path=/trunk/; revision=21728
2007-05-08 17:19:18 +00:00
Martin Mathieson c958b0b8fc Dissect IPPRIM conn_id field.
svn path=/trunk/; revision=21383
2007-04-11 14:34:56 +00:00
Gerald Combs 2e89206961 Try to fix a naming conflict on Windows.
svn path=/trunk/; revision=20814
2007-02-14 22:03:39 +00:00
Martin Mathieson 958a67763d Change fp_info struct to be more general by removing DCT2000-specific field.
Also:
- Fix a division-by-zero error in FP dissector
- Correct the way DCT2000 IPPrim addresses and ports are dissected and displayed

svn path=/trunk/; revision=20812
2007-02-14 15:41:43 +00:00
Martin Mathieson 997e5415f9 Add separate union entries to fvalue.value for signed and unsigned
32-bit numbers.  Separate signed and unsigned accessors have been
added and used where appropriate.

Definitely not for 0.99.5.

svn path=/trunk/; revision=20472
2007-01-18 11:02:26 +00:00
Martin Mathieson 86056bff3c "an wireshark" -> "a wireshark".
Presumably "an ethereal" was search replaced...

svn path=/trunk/; revision=20266
2007-01-02 13:25:36 +00:00
Guy Harris 303082812e From Sebastien Tandel: fix places where a signed character was being
passed to ctype.h macros.

Make some routines in packet-exec.c not used outside that file static,
and fix a typo.

svn path=/trunk/; revision=20222
2006-12-26 22:56:35 +00:00
Martin Mathieson 09c7a1abc4 Add a generated field for how many data bytes are accepted by subdissector
svn path=/trunk/; revision=20184
2006-12-21 18:00:07 +00:00
Martin Mathieson 9dcd4c23b2 Make prettier the parsing of IPPrim header fields.
Add mm3 -> http mapping.

svn path=/trunk/; revision=20024
2006-11-30 11:36:28 +00:00
Martin Mathieson 3dfa2fdfc3 Make it easier to track user-buffer-space vs capacity requests for HSDPA calls
svn path=/trunk/; revision=19871
2006-11-09 16:35:12 +00:00
Martin Mathieson 3d9709e6f3 Hopefully zap some warnings
svn path=/trunk/; revision=19702
2006-10-26 10:11:09 +00:00
Martin Mathieson e694978c74 Allow DCT2000 support to find a couple of more protocols.
Try to squash some warnings seen on the ubuntu buildbot log

svn path=/trunk/; revision=19683
2006-10-25 16:46:27 +00:00
Martin Mathieson d55c609c55 - Fix problems with parsing sctpprim headers
- Add dissection of nbap (as encap or inside sctp primitive)

svn path=/trunk/; revision=19664
2006-10-23 17:22:20 +00:00
Martin Mathieson 60193f0ae7 Make IPPrim based addresses filterable (mirroring ip/udp/tcp filter names).
Add some if (tree) tests to try to avoid doing extra work (large FP captures can be very slow to load).

svn path=/trunk/; revision=19439
2006-10-05 14:10:10 +00:00
Martin Mathieson 03a7d4ac2e Add missing updates to unbreak build...
svn path=/trunk/; revision=19287
2006-09-22 12:41:30 +00:00
Martin Mathieson 1936461d8d Added E-DCH (HSUPA) channels to FP.
Also show VPI/VCI/CID in ATM protocol label.

svn path=/trunk/; revision=19189
2006-09-11 12:03:29 +00:00
Martin Mathieson 2e1177c328 For DCT2000, show better transport info:
- for FP over AAL2, add CID to AAL tree
- for IPPRIM protocols, show IPV4 addresses in src & dst columns

svn path=/trunk/; revision=19156
2006-09-05 16:05:23 +00:00
Martin Mathieson 76192b1c6c Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage.
svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
Martin Mathieson 229e2dfbde - Removes last traces of 'board ports only' preference (other than marking it as an obselete preference)
- Add a preference to try to find messages within sctp primitive messages (tries renaming of known mismatches)
- Add outhdr to stub protocol (getting ready for IuB FP)

svn path=/trunk/; revision=18818
2006-08-02 09:30:28 +00:00
Ulf Lamping 5e62ced7e3 comment out the "catapult_dct2000_board_ports_only" part, so the Win32 buildbot has at least a chance to compile again
This is really not the preferred solution, but the current situation is even more ugly.

svn path=/trunk/; revision=18537
2006-06-21 20:34:28 +00:00
Gerald Combs f7e38bd5e6 Change ETH_VAR_IMPORT to WS_VAR_IMPORT. Try to fix a duplicate variable
definition in the Catapult DCT2000 code.

svn path=/trunk/; revision=18524
2006-06-20 18:30:54 +00:00
Anders Broman 81bda938ff From Martin Mathieson:
This patch:
- treats the variant field as a variable-length string field.  This is 
needed for some of the more complicated protocols where the variant 
number of the embedded protocol is also represented

- the patch to Makefile.am was not applied from 
http://www.wireshark.org/lists/wireshark-dev/200606/msg00009.html

svn path=/trunk/; revision=18427
2006-06-11 08:26:55 +00:00
Jörg Mayer 548d9ec98e warning fix: make function static
svn path=/trunk/; revision=18397
2006-06-08 14:36:17 +00:00
Anders Broman 996d4db495 Ethereal->Wireshark
svn path=/trunk/; revision=18234
2006-05-28 19:49:07 +00:00
Anders Broman 1814821adc From Martin Mathieson:
- Many DCT2000 protocols can be embedded within an IP primitive 
message.  Add a heuristic to see if we can find the protocol payload 
within in IP primitive message, and look for an ethereal dissector 
matching the DCT2000 protocol name (this is useful for simple protocol 
testing where no physical links are involved)
- Make some more of these protocols (diameter, http, mgcp) findable by name
- Adds protocol 'variant' number to stub and dissector
- Break the duplicated writing of the stub header out into a separate 
function

svn path=/trunk/; revision=18212
2006-05-23 05:48:00 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Anders Broman 375ba77274 From Martin Mathieson:
These patches:
- fix the bounds errors reported by coverity in bug 879
- fix a couple of other potential bounds errors (length checking 1st & 2nd lines in file)
- reorder catapult_dct2000_phdr so that normal protocol pseudo-header info is at the start.  This means that the stub dissector can avoid the nasty
(overlapped) memcpy
- a little whitespace fixing

svn path=/trunk/; revision=17886
2006-04-17 18:46:14 +00:00
Anders Broman 75f2454646 SVN properties...
svn path=/trunk/; revision=17864
2006-04-14 13:12:13 +00:00
Anders Broman af554c2f75 From Martin Mathieson:
patch and new files provide support for Catapult DCT2000 
.out files to wiretap and ethereal.

This wiretap support (catapult_dct2000.c+h) appends a short header to 
each packet giving some context, and a corresponding ethereal dissector 
(packet-catapult-dct2000.c) parses this before passing the real payload 
onto an existing ethereal dissector (for ethernet, ip, lapd, ppp, 
frame-relay,...).

For now, there is only support for saving dct2000 files in their own 
format, although I may add support for converting between dct2000 and 
libpcap later.

updated version of these files and patch, now with support 
for MTP2.  Olivier's trace used the ANSI variant - the MTP2 and MTP3 
decode fine with the right preferences set (although the ISUP dissector 
reports a reserved/retired message type).

Witha a change to NOT to declare gboolean catapult_dct2000_board_ports_only;
as extern as MSVC choked on it.

svn path=/trunk/; revision=17862
2006-04-14 12:41:06 +00:00