osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/epan/strutil.h

46 lines
1.5 KiB
C
Raw Normal View History

More EPAN-related code movements. Get rid of usage of #include "globals.h" and #include "util.h" from epan code. Move get_home_dir() into epan/filesystem.c as it's used by plugins.c. svn path=/trunk/; revision=2461
2000-09-28 03:16:29 +00:00
/* strutil.h
* String utility definitions
Move format_text(), get_token_len(), and fine_line_end(), into strutil.c This keeps tvbuff.c generic; it doesn't have to pull in packet.h and all of it's included files. svn path=/trunk/; revision=2409
2000-09-11 16:16:13 +00:00
*
WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3's <packet32.h> includes <winsock2.h>; we include that rather than <winsock.h>, to avoid errors due to conflicting declarations in <winsock.h> and <winsock2.h>. svn path=/trunk/; revision=5742
2002-06-23 10:32:36 +00:00
* $Id: strutil.h,v 1.7 2002/06/23 10:32:32 guy Exp $
Move format_text(), get_token_len(), and fine_line_end(), into strutil.c This keeps tvbuff.c generic; it doesn't have to pull in packet.h and all of it's included files. svn path=/trunk/; revision=2409
2000-09-11 16:16:13 +00:00
*
* Ethereal - Network traffic analyzer
WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3's <packet32.h> includes <winsock2.h>; we include that rather than <winsock.h>, to avoid errors due to conflicting declarations in <winsock.h> and <winsock2.h>. svn path=/trunk/; revision=5742
2002-06-23 10:32:36 +00:00
* By Gerald Combs <gerald@ethereal.com>
Move format_text(), get_token_len(), and fine_line_end(), into strutil.c This keeps tvbuff.c generic; it doesn't have to pull in packet.h and all of it's included files. svn path=/trunk/; revision=2409
2000-09-11 16:16:13 +00:00
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __STRUTIL_H__
#define __STRUTIL_H__
Fix build on Win32. svn path=/trunk/; revision=2411
2000-09-11 20:05:13 +00:00
/* ... thus, config.h needs to be #included */
On some UNIX platforms, you need to include <sys/types.h> to get "u_char" defined. svn path=/trunk/; revision=2413
2000-09-11 23:31:05 +00:00
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> /* for u_char */
#endif
WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3's <packet32.h> includes <winsock2.h>; we include that rather than <winsock.h>, to avoid errors due to conflicting declarations in <winsock.h> and <winsock2.h>. svn path=/trunk/; revision=5742
2002-06-23 10:32:36 +00:00
#ifdef HAVE_WINSOCK2_H
# include <winsock2.h> /* for u_char */
Fix build on Win32. svn path=/trunk/; revision=2411
2000-09-11 20:05:13 +00:00
#endif
Move format_text(), get_token_len(), and fine_line_end(), into strutil.c This keeps tvbuff.c generic; it doesn't have to pull in packet.h and all of it's included files. svn path=/trunk/; revision=2409
2000-09-11 16:16:13 +00:00
const u_char *find_line_end(const u_char *data, const u_char *dataend,
const u_char **eol);
int get_token_len(const u_char *linep, const u_char *lineend,
const u_char **next_token);
gchar* format_text(const u_char *line, int len);
Move "bytes_to_str()" to "strutil.c" from "packet.c" - it's just a string formatter, like "format_text()", and, as "tvbuff.c" now calls it (*vide infra*), we don't want to have to make "tvbuff.c" drag "packet.h" in just to declare "bytes_to_str()". It's now declared in "strutil.h", so include it in modules that use "bytes_to_str()" and weren't already including it. Add a "tvb_bytes_to_str()" wrapper that calls "tvb_get_ptr()" to get a pointer to a chunk of N bytes at a given offset in a tvbuff and then hands that chunk to "bytes_to_str()". Convert the code that was doing that to use "tvb_bytes_to_str()" instead (which caught what I suspect is a bug in the Q.2931 dissector, where it was handing an offset of 0 to "tvb_get_ptr()" - a cut-and-pasteo, I think). Tvbuffify the ARP dissector. svn path=/trunk/; revision=2634
2000-11-13 07:19:37 +00:00
gchar* bytes_to_str(const guint8 *, int);
Enable FT_BYTES dfiltering, from Ed Warnicke. svn path=/trunk/; revision=2768
2000-12-22 12:05:38 +00:00
gchar* bytes_to_str_punct(const guint8 *, int, gchar punct);
Move format_text(), get_token_len(), and fine_line_end(), into strutil.c This keeps tvbuff.c generic; it doesn't have to pull in packet.h and all of it's included files. svn path=/trunk/; revision=2409
2000-09-11 16:16:13 +00:00
#endif /* __STRUTIL_H__ */