aboutsummaryrefslogtreecommitdiffstats
path: root/epan/osi-utils.c
AgeCommit message (Collapse)AuthorFilesLines
2018-05-27Fix incorrect formatting of NSAP area addresses/address prefixes.Guy Harris1-2/+28
If the area address/address prefix is 13 octets long, use the 13th octet, not the 21st octet; the latter is *not* part of the area address/address prefix, and might either not be in the packet or might be some random other part of the packet. Add/expand comments while we're at it. Bug: 14744 Change-Id: I7b90318a72a49b67d8ec17952add528185fd064b Reviewed-on: https://code.wireshark.org/review/27848 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08epan: use SPDX indentifiers.Dario Lombardo1-13/+1
Skipping dissectors dir for now. Change-Id: I717b66bfbc7cc81b83f8c2cbc011fcad643796aa Reviewed-on: https://code.wireshark.org/review/25694 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-04osi-utils: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-1/+1
Clang Change-Id: I48121b5e73501a39ff5fb7986ab58242ee32af53 Reviewed-on: https://code.wireshark.org/review/20902 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-31Fix some dissection errors.Guy Harris1-11/+41
"XXX supported" for a metric type is a Boolean, not an int; add it as such. Add the value of the item without the extra bits. The length of an address prefix is in semi-octets (nibbles/hex digits), not in octets. Change-Id: I642f0dab5030f7609e89f45cf2cff15cd74dfbda Reviewed-on: https://code.wireshark.org/review/20819 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-30Add a bunch of #defines for OSI NSAP AFI values, and use them.Guy Harris1-3/+3
Have the ISUP value_string for those AFI values show "decimal" and "binary" indicators. Update some references. Change-Id: I07797455f5ffa5fa9cd4e0702a6f5db831054937 Reviewed-on: https://code.wireshark.org/review/20798 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-30Make some routines static.Guy Harris1-3/+5
Change-Id: I04860f058345cb633ab379c83dcfc24b6cf1a846 Reviewed-on: https://code.wireshark.org/review/20797 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-22Add address_to_bytes API.Michael Mann1-1/+1
This will copy an address's "byte format" into a buffer. The original intended design is for export_pdu functionality, which tries to do this "manually" for many address types (and creates undesired dependencies) The default functionality if a "byte format function" isn't provided (currently the case for all address types) is a memcpy of the address data. Providing "address to byte" functions to aid export PDU functionality will be provided later. Change-Id: I3703f9e617a8cef09165ad53a0f98c6372676b9b Reviewed-on: https://code.wireshark.org/review/16070 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-27Pass tvb and offset into print_nsap_net() and print_area() to "hide" the ↵Michael Mann1-4/+4
tvb_get_ptr call that dissectors are using. Change-Id: Ibc5a51be462d431b85b34cac7a358d736ec7b9db Reviewed-on: https://code.wireshark.org/review/7422 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Add some casts to satisfy the various compilers.AndersBroman1-1/+1
Change-Id: I7687fc0b433774fe447757af00bdaa2fc44ac59d Reviewed-on: https://code.wireshark.org/review/7254 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Add name resolution support to address type.Michael Mann1-3/+3
Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-09Add fixed length function for address types.Michael Mann1-1/+1
This allows for even more cleanup with respect to how address types are handled, including removing address_to_str.c. Most of the functionality was folded into address_types.c, but the remainder was just dispersed because it didn't make sense to keep the file. Change-Id: Id4e9391f0c3c26eff8c27b362e4f7a1970d718b4 Reviewed-on: https://code.wireshark.org/review/7038 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-09Add "column filter string" support to address types.Michael Mann1-1/+1
Information about dissector (filter) fields should be kept in a dissector as much as possible. Supporting "column filter string" also allows other dissectors to create their own "address types" with different column filters (because AT_ETHER isn't always an "Ethernet" address). This feature also allowed a few "dissector specific" address types to be moved to their own dissector. Change-Id: Ie9024af4db62bc2ee4f8c9d28a1d807f706f45bf Ping-Bug:7728 Reviewed-on: https://code.wireshark.org/review/7029 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-09Add address type registration.Michael Mann1-3/+35
Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18Remove some apparently-unnecessary includes of emem.h.Guy Harris1-1/+0
Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80 Reviewed-on: https://code.wireshark.org/review/6635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-17Replace the last of ep_alloc and ep_alloc0 with wmem equivalent.Michael Mann1-3/+3
Change-Id: I0338d0acda5e4b9957aad4825ca2cfd6fa506ead Reviewed-on: https://code.wireshark.org/review/6596 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08Replace some ep_alloc and ep_alloc0 with its wmem equivalent.Michael Mann1-2/+2
These cases were pretty easy to identify. Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced. Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a Reviewed-on: https://code.wireshark.org/review/6392 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-28OSI util: Add modelines infoAlexis La Goutte1-0/+12
Change-Id: I15e44f2f10b80b7c7ce78ce84b748ce8ec7a2eff Reviewed-on: https://code.wireshark.org/review/3890 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-14Put the system ID in the top-level items for neighbors.Guy Harris1-0/+7
Add a tvb_print_system_id() routine, and use that in various ISIS dissectors, while we're at it. Change-Id: I31b6b9ea8faf2b4849f974ec7ed27fbdd14b91ef Reviewed-on: https://code.wireshark.org/review/1145 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-05Fix some code remove by 296591399f90a9d89be958d91047aa724a77ee6dAlexis La Goutte1-0/+1
(Copyright or info about file...) Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1 Reviewed-on: https://code.wireshark.org/review/515 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-03-20 From beroset:Bill Meier1-3/+3
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397 svn path=/trunk/; revision=48438
2012-12-21Clean up white space.Guy Harris1-17/+16
Add a return where I presume it was intended to be - a 4-octet address is completely handled in that if clause, so there's no reason to fall through. Fix a comment. svn path=/trunk/; revision=46646
2012-12-21Fix some valgrind warnings from the capture attached toEvan Huus1-3/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8110 I can't reproduce the actual reported crash on trunk. svn path=/trunk/; revision=46645
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45016
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2011-02-18Fix some dead code and zero division issues found by Clang scan-build.Gerald Combs1-2/+2
In convert_string_case() use g_utf8_strup() instead of converting each character by hand. Hopefully this won't cause any unexpected changes in behavior. svn path=/trunk/; revision=36006
2010-01-04From gonzalocas:Anders Broman1-1/+6
GSSE message dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4370 svn path=/trunk/; revision=31442
2009-04-08size_t fixes.Gerald Combs1-22/+23
svn path=/trunk/; revision=27990
2006-05-21name changeRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=18197
2006-03-07Remove dead code. Due the to if() test that checks for specificGilbert Ramirez1-4/+5
values of 'length', the code in question can never run. This fixes Coverity bug ID #1. svn path=/trunk/; revision=17514
2005-09-12The previous checkin for packet-isup.c was accidentally checked in alongGuy Harris1-0/+5
with some unrelated changes; it got rid of some calls to get IPv4/IPv6 addresses and add them to the protocol tree, replacing them with proto_tree_add_item() calls, and fixed up the length of one protocol tree item. Note that we have (at least) three count 'em three different routines for dissecting/displaying NSAPs (there might be more - I might have missed some), and suggest that we might want to reduce that to one. Update the URL for ICP values for IPv{4,6} addresses inside NSAPs. Fix the offset in the call to add the IPv6 address part of an NSAP containing such an address, and the length in the call adding the DSP for an NSAP containing an IPv4 address. Fix up indentation a bit. svn path=/trunk/; revision=15766
2005-08-20The order in which arguments to a function are evaluated isn't definedGuy Harris1-2/+4
by C. Do decrements of arguments before passing them to a function. svn path=/trunk/; revision=15463
2005-08-20removal of even more sprintfRonnie Sahlberg1-34/+34
svn path=/trunk/; revision=15457
2005-08-17replace some more silly rotating buffers with ep_alloc() callsRonnie Sahlberg1-6/+4
svn path=/trunk/; revision=15386
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2003-11-20From Hannes Gredler: "print_system_id()" should callGuy Harris1-2/+2
"print_system_id_buf()", not "print_nsap_net_buf()". (What idiot made *that* mistake? :-)) svn path=/trunk/; revision=9046
2003-09-10Void functions don't return values.Guy Harris1-2/+2
svn path=/trunk/; revision=8442
2003-08-26Create an "address_to_str_buf()" routine, called by "address_to_str()",Guy Harris1-64/+88
which fills in a caller-supplied buffer. Create "_buf()" versions of various "to_str" routines for various address types, and create a routine to map SNA FIDs to strings, and use them to finish up "address_to_str_buf()". Get rid of the declaration of "sna_fid_type_4_addr_to_str()" in "packet-sna.h", as that routine has been swallowed up in "sna_fid_to_str()". svn path=/trunk/; revision=8260
2003-01-26Update my email address in various places since my old one no longer worksLaurent Deniel1-2/+2
svn path=/trunk/; revision=7003
2002-09-02From Hannes Gredler:Guy Harris1-3/+3
open up a new subtree for dissecting the lsp-entry TLV; remove the isis_lsp_decode_lsp_id() routine, as the same functionality is better served using print_system_id(); fix a small bug in print_system_id(). svn path=/trunk/; revision=6169
2002-08-29From Hannes Gredler: make the IS-IS dissector more verbose in the INFOGuy Harris1-4/+10
field - specifically for IIHs the System-ID of the Hello; LSPs the LSP-ID, Sequence #, Lifetime; CSNPs the LAN-ID, Start LSP-ID, End LSP-ID. and change the display of some IDs. Clean up white space. svn path=/trunk/; revision=6128
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-24/+24
winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer1-5/+1
equivalents for the epan/ directory but leave winsock2.h in inet_pton.c and inet_ntop.c for now (can't estimate the consequences). svn path=/trunk/; revision=5928
2002-07-17From Joerg Mayer:Guy Harris1-5/+1
dftest.c: Remove #if-0-ed includes packet-ieee80211.c, packet-wtls.c, packet-afp.c, packet-wsp.c, packet-wtp.c, ethereal_gen.py: Remove redundant include varargs (already in snprintf.h, and required only for snprintf.h) Remove unused include of snprintf.h from files not using "snprintf()". svn path=/trunk/; revision=5889
2002-06-28From Hannes Gredler: fix display of OSI system IDs to use a dot ratherGuy Harris1-3/+3
than a dash before the PSN byte; the dash is typically only used to demarcate the fragment. svn path=/trunk/; revision=5785
2001-05-15Stop depending on the order in which operations are performed byGuy Harris1-7/+11
generated code, as per Chris Foulds' note. Also, when constructing the system ID or area string, always append the four-octet groups, rather than overwriting them, as we had been doing. svn path=/trunk/; revision=3414
2001-04-16Assorted ISIS enhancements from Hannes Gredler.Guy Harris1-2/+7
When dissecting the ISIS NLPID CLV, use the "nlpid_vals" array to convert NLPID values to protocol names. svn path=/trunk/; revision=3308
2001-04-02Don't use "u_int" and "u_char", as they're not defined in <sys/types.h>Guy Harris1-6/+6
on Windows, so we'd have to drag in <winsock.h> to define them. svn path=/trunk/; revision=3246
2001-04-01Moved some definitions and functions from packet-osi.{c,h} toEd Warnicke1-0/+172
epan/osi-utils.{c,h} to bring all of the epan dependencies into epan. svn path=/trunk/; revision=3226
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 05:17:58 +0000