64a33ad7af
Apply some of the patches from:
...
http://wiki.wireshark.org/Development/Optimization
svn path=/trunk/; revision=28364
2009-05-14 20:04:28 +00:00
a503077b85
From Reinhard Speyerer:
...
This patch fixes several misspellings/typos in Wireshark SVN revision 28201.
svn path=/trunk/; revision=28203
2009-05-01 06:57:27 +00:00
b751e5367c
Constify some more value_strings.
...
svn path=/trunk/; revision=28101
2009-04-21 05:33:32 +00:00
9ebac2bff6
g_free() is NULL safe, so we don't need check against it.
...
svn path=/trunk/; revision=27719
2009-03-13 22:21:22 +00:00
5742ede54c
Add an additional "title" attribute for UAT fields; that's what's
...
displayed to the user.
svn path=/trunk/; revision=27462
2009-02-16 04:10:06 +00:00
a8f30cbca1
Fix some typos and spelling (mostly in text strings)
...
svn path=/trunk/; revision=27037
2008-12-17 17:23:37 +00:00
ec08463198
Fix previous fix.
...
svn path=/trunk/; revision=26774
2008-11-13 18:26:38 +00:00
373f142bcd
Fix some warnings.
...
svn path=/trunk/; revision=26773
2008-11-13 17:58:14 +00:00
1b0b2bb4b6
From Paul Stath:
...
Dissector fails for OIDs with MacAddress in index.
svn path=/trunk/; revision=26746
2008-11-10 20:25:38 +00:00
49fe94aa3f
Fix for bug 2823
...
Do not pass automatic variables back into caller space.
svn path=/trunk/; revision=26426
2008-10-13 06:56:27 +00:00
aac8e0d91d
Fix a spelling error pointed out by Noam Rathaus.
...
svn path=/trunk/; revision=26228
2008-09-18 17:19:15 +00:00
d13bc6c7f4
Fix a (probably benign) case where it appears that && should be &
...
svn path=/trunk/; revision=26058
2008-08-22 14:28:03 +00:00
42c3239a1a
luis.ontanon@gmail.com => luis@ontanon.org
...
svn path=/trunk/; revision=25937
2008-08-05 21:03:46 +00:00
1cbce0623f
It is useless in a Protocol Analyzer to avoid the user to have a password shorter than 8 chars.
...
svn path=/trunk/; revision=25043
2008-04-15 12:12:20 +00:00
f8e75ecd32
Make the SMI preference a little more verbose. In the COPS and SNMP
...
preferences, tell the user where they can change the SMI settings. In
the 802.11 preferences, fix a tooltip.
svn path=/trunk/; revision=24620
2008-03-13 22:17:11 +00:00
aa9b4bf541
Add a const.
...
svn path=/trunk/; revision=24592
2008-03-09 14:20:28 +00:00
9f412a5a8a
Show VarBind OIDs and trap enterprise OID in info column.
...
Initialize pdu_type in dissect_snmp_PDUs() and param_tvb in
dissect_snmp_SnmpEngineID() to avoid potential crashes.
svn path=/trunk/; revision=24591
2008-03-09 13:58:58 +00:00
3c6ecbf54b
Corrected a typo: octestring -> octetstring.
...
svn path=/trunk/; revision=24589
2008-03-09 11:24:37 +00:00
293e337c2b
Display agent-addr as IPv4 address.
...
svn path=/trunk/; revision=24588
2008-03-09 10:54:55 +00:00
fdc980e79d
Added an option to uat_new() to set if configuration shall be saved in the
...
selected profile.
Don't save SMI Paths and SMI Modules in the profiles because reloading
currently doesn't work (bug 2309).
svn path=/trunk/; revision=24580
2008-03-06 22:13:24 +00:00
b091b8d26c
Rewrote to use g_strlcpy and g_strlcat.
...
svn path=/trunk/; revision=24525
2008-03-01 17:23:39 +00:00
6b59696fd7
Added missing array for hf_snmp_big_counter_value.
...
svn path=/trunk/; revision=24516
2008-03-01 11:43:04 +00:00
2ed9d7d43e
Make sure we don't dereference a NULL pointer. Fixes bug 2277.
...
svn path=/trunk/; revision=24467
2008-02-26 01:17:18 +00:00
1997308ac1
Handle unsigned SMI types. This should fix bug 2292.
...
svn path=/trunk/; revision=24457
2008-02-25 00:00:41 +00:00
e6e926d5f1
get rid of get_ber_last_created_item()
...
svn path=/trunk/; revision=24001
2008-01-03 13:07:17 +00:00
3fe2bbe38f
Fetch ObjectName and its relative oid_info before handling an eventual error
...
value, so we have valid values to put in the VarBind entry. Include the error
note text as the label.
This should fix bug 2144.
svn path=/trunk/; revision=23962
2007-12-28 22:19:33 +00:00
3d22aa561b
asn1/*/Makefile.nmake were not part of the source package.
...
Spotted by Tomas Kukosa.
svn path=/trunk/; revision=23921
2007-12-19 10:02:50 +00:00
1e794fc494
ANSI TCAP regenerated and tested with -T -X asn2wrs options
...
asn2wrs has -T (tagged types support) and -X (new BER sttructures) default behavior
remove all -T and -X usage
svn path=/trunk/; revision=23823
2007-12-10 08:35:41 +00:00
0ba8976eb7
fix confusion in tag handling
...
svn path=/trunk/; revision=23702
2007-12-03 13:48:45 +00:00
7eb5048da9
fix tag handling inside snmp trap
...
svn path=/trunk/; revision=23508
2007-11-20 13:55:39 +00:00
b638f9490f
dissect_ber_choice() returns the index of the choice, not the tag of the
...
choice
svn path=/trunk/; revision=23454
2007-11-15 09:49:55 +00:00
7d8064f548
Initialize var_list in dissect_smux(), so that we don't use previously
...
ep_freed() memory and abort.
svn path=/trunk/; revision=23436
2007-11-12 18:44:29 +00:00
44470bc5f4
SNMP with option -X and -T
...
svn path=/trunk/; revision=23352
2007-11-04 16:47:30 +00:00
b337d20d4c
Include winposixtypes.h only if building with GNUTLS; Bug 1942: part 2 of 2 of fix.
...
asn1 template file plus generated .[hc] files;
Note that the generated files include changes which are a result of previous
changes to snmp.cnf (SVN #23252 ) and of other changes (eg: svn 21145).
svn path=/trunk/; revision=23302
2007-10-29 01:14:51 +00:00
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
d0e34ab8c3
Remove the remaining autogenereated -exp.cnf files
...
svn path=/trunk/; revision=23148
2007-10-11 17:56:24 +00:00
0e0bed500d
- Remove -e option if the generated -exp.cnf file isn't used.
...
- Add EXPORT_FILES to all files that still contain -e.
svn path=/trunk/; revision=23145
2007-10-11 05:27:27 +00:00
61cde0d09e
- Change Makefiles to include preinc
...
- Add missing new directories to asn1/Makefile.nmake
svn path=/trunk/; revision=23141
2007-10-10 19:03:24 +00:00
24470fdfae
More conversions and updates to existing Makefile stuff
...
svn path=/trunk/; revision=23127
2007-10-10 08:09:19 +00:00
094e2a9a5f
Get rid of the remains of NET-SNMP in the build process.
...
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
8f19616ae8
Modified some ASN1 Makefiles to compile on unix.
...
Added some clean targets.
Removed asn1/x501 directory.
svn path=/trunk/; revision=22886
2007-09-17 11:53:33 +00:00
2ae2f20203
Try to get the Windows buildbot going by avoiding namespace collision.
...
svn path=/trunk/; revision=22871
2007-09-14 06:51:07 +00:00
168f8923e7
eliminate an anonymous enum.
...
svn path=/trunk/; revision=22868
2007-09-13 20:27:05 +00:00
fb34ef1f2c
Given the opportunity I check in the changes to snmp I got in this machine.
...
- Indexing (implied and not) is OK now, however indexes for related tables (AUGMENT, EXTEND, etc) are registered many times.
svn path=/trunk/; revision=22861
2007-09-13 16:49:51 +00:00
d56f4f3a68
- turn some other TC from FT_BYTES to FT_STRING so that human-readable strings become readable by humans
...
- Add the EngineId decoding for the contextEngineId
- Add some expert info about malformed indexed oids
svn path=/trunk/; revision=22720
2007-08-28 23:55:49 +00:00
8d3b80e57b
Add some more expert info.
...
Restore engine-id dissection (a "victim" of decryption support)
svn path=/trunk/; revision=22719
2007-08-28 23:19:30 +00:00
79ea56143c
Fix non implicit oid key indexes. This starts to look good!
...
svn path=/trunk/; revision=22718
2007-08-28 21:27:54 +00:00
dfbac00752
SNMP:
...
- As noted by Thomas Anders values are not added to the tree anymore. Move the calling of subdissectors to the end of the function, so that the value is added to the tree.
- add port 8161 to be decoded as SNMP (hey, it's on IANA's services file!)
UAT:
- do not have the uat reloaded.
OIDS:
- do not complain if renaming an OID to an identical name
svn path=/trunk/; revision=22704
2007-08-28 15:18:32 +00:00
99a2ec1c9f
fix bug in snmp.variable_oid subdissector calling and call them at the end of snmp dissector (so as snmp does not overwrite COL_INFO of subdissector)
...
svn path=/trunk/; revision=22701
2007-08-28 07:59:35 +00:00
392fd3f689
- packet-snmp(-template).c
...
- reimplement the "snmp.variable_oid" dissector table
- oids.[ch]
- get rid of keytype_implicit in oid_value_type_t we won't use it.
- have the windows base path for mibs be consistent to where we've put the mibs
- oid_get_from_encoded() and oid_get_from_string(): have the subids array being computed in a prior statement of where the side-effected argument is going to be used... worked on gcc, not on windows... I deserve "have daemons flying out of my nose" for that :-).
svn path=/trunk/; revision=22684
2007-08-27 17:05:11 +00:00
00c5e48a17
get users of oid_resolv to use the new oids, rollout packet-snmp.c
...
svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
b312e64f6a
get_ber_length doesn't need the tree argument, get rid of it.
...
Rebuild asn1 dissectors.
svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
4787c0ce6a
this one was missing
...
svn path=/trunk/; revision=22620
2007-08-24 00:41:43 +00:00
2fdaae5dc2
Never, never, never modify a generated file... or out of idiocy you might loose changes (or not check them in).
...
svn path=/trunk/; revision=22619
2007-08-24 00:33:35 +00:00
e7d5e2fc2d
Another iteration, the new code is almost there, We're missing just the implied octetstrings indexes.
...
svn path=/trunk/; revision=22618
2007-08-24 00:26:30 +00:00
cfc4b0efc8
Implement Resolution of conceptual table indexing
...
So far this has being tested only for integer indexes.
svn path=/trunk/; revision=22606
2007-08-23 19:45:31 +00:00
76658ef0f1
A further iteration in the code, things start to look good!
...
svn path=/trunk/; revision=22575
2007-08-21 21:32:00 +00:00
a5efe69a79
Filtering on snmp variables starts to work so I put it there in case anyone wants to start playing with it. I'll leave the generated dissector in place and the rest off the Makefiles so that others are not bothered by this.
...
TODO:
- Global
- add libsmi to autoconf (I modified CFLAGS and LDADDs in the makefile.ams appending my own values, that's good only for me)
- have other users of oid_resolv.h get to use the new functions in oids.h
- add a menu item or preference setting for the smi_modules UAT ( the smi_modules file has one dquoted string per line with the name of each module to be loaded)
- SNMP
- put complete information in the labels of the VarBind Items
- add oids to COL_INFO
- negative testing (Well, testing in general)
- OIDS
- implement "ALL" modules
- some functions are not yet tested or implemented
I'll put a TO-DO list on the wiki for people (incl. me) to add more items
svn path=/trunk/; revision=22556
2007-08-19 23:00:47 +00:00
a6dd859454
For LEGO: Use crypt_tvb when we don't have cleartext_tvb
...
svn path=/trunk/; revision=22358
2007-07-19 14:04:56 +00:00
81e2b4b66e
Change "lenght" to "length", this time in the *source* of the SNMP dissector (sigh)
...
svn path=/trunk/; revision=22357
2007-07-19 13:43:36 +00:00
2e6db8fc74
Remove old readme file from snmp asn1 directory that says it isn't ready
...
for use because it is already in use as the packet-snmp.c dissector.
svn path=/trunk/; revision=21965
2007-05-28 02:33:43 +00:00
f08cd1e5e3
actx in the rest of dissect_ber..()l
...
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
c01f382974
Second step in introducing asn context to BER dissectors just like in PER.
...
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
a70a1b3eb6
EXTERNAL type is handled in asn2wrs now
...
private implementations were renamed EXTERNAL -> EXTERNALt
svn path=/trunk/; revision=21662
2007-05-03 11:37:47 +00:00
1bc049906a
Add some GCC warnings to the standard set, and add some others to the
...
--enable-extra-gcc-checks set.
If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.
Constify a bunch of stuff, and make some other changes, to get rid of
warnings.
Clean up some indentation.
svn path=/trunk/; revision=21526
2007-04-23 10:59:26 +00:00
a031a39a31
Implement proposed fix for Bug 1125
...
svn path=/trunk/; revision=21339
2007-04-05 22:16:12 +00:00
296a77efdc
migrate packet-megaco.c from plugins/megaco to epan/dissectors
...
svn path=/trunk/; revision=21191
2007-03-25 21:59:16 +00:00
b26c1c4ca2
Add a description of UAT fields, and have it as a tooltip in the New/Edit Dialog.
...
svn path=/trunk/; revision=20797
2007-02-12 19:57:41 +00:00
4e55e354bb
Have the windows buildot compiling again.
...
svn path=/trunk/; revision=20742
2007-02-08 10:15:04 +00:00
b08d8470e7
Oddly enough MSVC cannot compile this one.
...
svn path=/trunk/; revision=20738
2007-02-07 18:51:44 +00:00
2006fac500
* Add a category param to the uat.
...
* UATify SNMP Users
svn path=/trunk/; revision=20736
2007-02-07 14:54:35 +00:00
f67fdf4865
Move sha1.[ch] to epan/crypt/crypt-sha1.[ch]. Remove duplicate code.
...
svn path=/trunk/; revision=20399
2007-01-12 00:33:32 +00:00
efa6338231
warn the user if the decrypted data doesn't look like a ScopedPDU instead of dissecting it.
...
svn path=/trunk/; revision=20393
2007-01-11 17:39:16 +00:00
5223c8dfa6
- allow use of * as any-engine-id
...
- automatic localization of usertable entries with no engine-id
- remove last remains of debug code
svn path=/trunk/; revision=20387
2007-01-11 00:29:50 +00:00
b82782e9c8
+ AES decryption
...
svn path=/trunk/; revision=20369
2007-01-10 02:30:22 +00:00
0ddb0fd48f
* sha1 authentication
...
- remove warnings and test code
svn path=/trunk/; revision=20366
2007-01-10 01:15:18 +00:00
faa3da9af0
change the loading order of some headers to avoid a conflict with net-snmp
...
svn path=/trunk/; revision=20356
2007-01-09 20:22:48 +00:00
f7a79f43e7
SNMPv3 USM decryption/authentication phase 1
...
svn path=/trunk/; revision=20353
2007-01-09 18:38:55 +00:00
e26860607d
Get rid of UCD SNMP support (it's not longer supported and
...
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.
svn path=/trunk/; revision=20071
2006-12-08 15:05:41 +00:00
07a6f489a3
Fix property typo: svm:keywords --> svn:keywords
...
svn path=/trunk/; revision=19993
2006-11-26 18:53:35 +00:00
ff4739e437
Fix some property typos (eg: svn:kwywords, swn:keywords, etc)
...
Add 'svn:eol-style native' for a few .[hc] files
svn path=/trunk/; revision=19992
2006-11-26 18:31:53 +00:00
647533a5ef
put every python script name into "" so the call won't fail on Win32 native python.
...
The problem is the slash in e.g.:
@$(PYTHON) ../../tools/make-dissector-reg.py
is interpreted as an option instead of being part of the path.
I didn't wanted to use backslashes as this might introduce new problems with cygwin's python port.
svn path=/trunk/; revision=19730
2006-10-29 17:19:52 +00:00
acff0f06a5
Fix Id marking
...
svn path=/trunk/; revision=19686
2006-10-25 19:26:58 +00:00
a3eedad0d1
Counter64 should be a FT_UINT64 and not a FT_UINT32
...
fixes bug 1047
svn path=/trunk/; revision=19002
2006-08-23 08:05:28 +00:00
d55ec3bd66
Fix compilation on systems with Net-SNMP.
...
svn path=/trunk/; revision=18695
2006-07-10 01:05:24 +00:00
8b315480f1
In new_format_oid(), handle a zero-length OID.
...
Fix a bug introduced recently in packet-rpc.c.
Replace DISSECTOR_ASSERT() with THROW(ReportedBoundsError) in my recent
checkins, since fuzz-test.sh sets WIRESHARK_ABORT_ON_DISSECTOR_BUG.
svn path=/trunk/; revision=18693
2006-07-09 22:12:02 +00:00
de826c3425
Don't pass an empty OID to sprint_realloc_variable(). This should fix a
...
recent fuzz error.
Fix up whitespace.
svn path=/trunk/; revision=18667
2006-07-05 21:30:25 +00:00
b9ee7a9b4f
replace the two remaining g_malloc with ep_alloc
...
this indirectly fixes a tiny memory leak with one of the g_mallocs
svn path=/trunk/; revision=18649
2006-07-04 03:27:14 +00:00
45cb7d3fab
check_var_length can also return ewp allocated memory now
...
svn path=/trunk/; revision=18648
2006-07-04 03:15:58 +00:00
889fe1c6fe
make new_format_oid return ep allocated data.
...
this also removes several small memory leaks through get_oid_name and get_oid_str_name where the callers nevber freed the data
svn path=/trunk/; revision=18647
2006-07-04 02:36:18 +00:00
c27681ad4d
make format_oid use ep allocated memory internally instead of malloced memory
...
svn path=/trunk/; revision=18645
2006-07-04 02:15:55 +00:00
69ccdaa778
make format_var return ep allocated memory
...
svn path=/trunk/; revision=18644
2006-07-04 01:56:52 +00:00
392e584e1e
Include <ctype.h> to fix some warnings. Regenerate the
...
dissector.
svn path=/trunk/; revision=18461
2006-06-14 08:08:51 +00:00
a063a87af5
- "next tvb" list moved from h225 to new file next_tvb.[ch]
...
- h225 updated and regenerated
- restore calling subdissectors for SNMP variables which was broken with new SNMP
svn path=/trunk/; revision=18451
2006-06-13 13:21:12 +00:00
16f57a74c6
Add some missing *-exp-cnf files
...
svn path=/trunk/; revision=18261
2006-05-31 04:52:33 +00:00
d17dad9ead
Atempt to fix bug 967 crash on fuzzed SNMP capture. I can't reproduce the Bug.
...
svn path=/trunk/; revision=18216
2006-05-23 20:36:49 +00:00
55600fb60a
Ethereal -> Wireshark
...
asn2eth -> asn2wrs
svn path=/trunk/; revision=18214
2006-05-23 15:17:14 +00:00
f0b33a4789
ethereal->wireshark updates
...
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
62da958bd9
- asn2eth renamed to asn2wrs
...
- remove obsolete -X option from makefiles
- not generate enumerated map table for BER
dissector will be regenerated later
svn path=/trunk/; revision=18199
2006-05-21 14:36:05 +00:00
89f022b12b
name change
...
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
aa4b59de6f
Don't throw an exception in oid_to_subid_buf() if the generated OID is
...
zero-length - oid_to_subid_buf() can be called when we're not in the
middle of a dissection, and throwing a "dissector bug" assertion in that
case is itself a bug.
svn path=/trunk/; revision=18164
2006-05-15 17:58:39 +00:00
e49fe267e6
Remove stupid code.
...
svn path=/trunk/; revision=18148
2006-05-14 08:17:39 +00:00
396a33dbee
snmp: Hopfully fix bug Bug 925.
...
Add packet-ulp.c missing from last commit.
svn path=/trunk/; revision=18144
2006-05-13 22:18:08 +00:00
9740278a1d
Fix bug 926 OID wrongly decoded.
...
svn path=/trunk/; revision=18106
2006-05-08 17:30:24 +00:00
abbbc2c4da
Use the asn2eth generated snmp dissector.
...
svn path=/trunk/; revision=18086
2006-05-03 19:09:03 +00:00
a6930fe4ae
Add distclean and maintainerclean rules.
...
svn path=/trunk/; revision=17999
2006-04-25 18:45:08 +00:00
b4d7dd6060
Some more variable bindings and add some mising PDU types.
...
svn path=/trunk/; revision=17637
2006-03-15 18:57:47 +00:00
beeb757f61
Start implementing the variable binding part.
...
svn path=/trunk/; revision=17631
2006-03-15 06:20:23 +00:00
54f6b68edc
Add parsertab.pyc in clean target
...
svn path=/trunk/; revision=17387
2006-02-23 20:05:52 +00:00
f816511ea9
In packet-cops.c use proto_item_append_text() instead of creating a
...
separate buffer. Fixes the current Buildbot failure.
Don't let the sprint_realloc_* functions reallocate ep_allocated memory.
Add comments warning against this in the future.
In emem.c, make sure we don't use an extra 100k every stinkin' time
someone wants to allocate memory when debugging is enabled.
Fixup whitespace.
svn path=/trunk/; revision=17051
2006-01-18 20:02:19 +00:00
223506c537
Work in progress an asn2eth generated snmp dissector.
...
svn path=/trunk/; revision=16674
2005-12-04 21:45:38 +00:00
Anders Broman