git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add s1ap - needs more work, untested as no traces available yet.
[obnox/wireshark/wip.git]
/
tap-gsm_astat.c
diff --git
a/tap-gsm_astat.c
b/tap-gsm_astat.c
index ecaca3ea2fb984a0283961e724f0dc9328b4ac80..ba166fe9da31ca615abab1ac8bceae393233ddfe 100644
(file)
--- a/
tap-gsm_astat.c
+++ b/
tap-gsm_astat.c
@@
-5,8
+5,8
@@
*
* $Id$
*
*
* $Id$
*
- *
Ethereal
- Network traffic analyzer
- * By Gerald Combs <gerald@
ethereal.com
>
+ *
Wireshark
- Network traffic analyzer
+ * By Gerald Combs <gerald@
wireshark.org
>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@
-28,10
+28,6
@@
* This TAP provides statistics for the GSM A Interface:
*/
* This TAP provides statistics for the GSM A Interface:
*/
-/* With MSVC and a libethereal.dll this file needs to import some variables
- in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
-#define _NEED_VAR_IMPORT_
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@
-45,9
+41,10
@@
#include <string.h>
#include "epan/packet_info.h"
#include "epan/value_string.h"
#include <string.h>
#include "epan/packet_info.h"
#include "epan/value_string.h"
-#include "tap.h"
-#include "packet-bssap.h"
-#include "packet-gsm_a.h"
+#include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
+#include <epan/dissectors/packet-bssap.h>
+#include <epan/dissectors/packet-gsm_a.h>
#include "register.h"
#include "register.h"
@@
-66,15
+63,12
@@
typedef struct _gsm_a_stat_t {
static int
gsm_a_stat_packet(
void *tapdata,
static int
gsm_a_stat_packet(
void *tapdata,
- packet_info *pinfo,
+ packet_info *pinfo
_U_
,
epan_dissect_t *edt _U_,
epan_dissect_t *edt _U_,
-
void
*data)
+
const void
*data)
{
gsm_a_stat_t *stat_p = tapdata;
{
gsm_a_stat_t *stat_p = tapdata;
- gsm_a_tap_rec_t *tap_p = data;
-
-
- pinfo = pinfo;
+ const gsm_a_tap_rec_t *tap_p = data;
switch (tap_p->pdu_type)
{
switch (tap_p->pdu_type)
{
@@
-276,14
+270,11
@@
gsm_a_stat_draw(
static void
static void
-gsm_a_stat_init(c
har *optarg
)
+gsm_a_stat_init(c
onst char *optarg _U_,void* userdata _U_
)
{
gsm_a_stat_t *stat_p;
GString *err_p;
{
gsm_a_stat_t *stat_p;
GString *err_p;
-
- optarg = optarg;
-
stat_p = g_malloc(sizeof(gsm_a_stat_t));
memset(stat_p, 0, sizeof(gsm_a_stat_t));
stat_p = g_malloc(sizeof(gsm_a_stat_t));
memset(stat_p, 0, sizeof(gsm_a_stat_t));
@@
-307,5
+298,5
@@
gsm_a_stat_init(char *optarg)
void
register_tap_listener_gsm_astat(void)
{
void
register_tap_listener_gsm_astat(void)
{
- register_
ethereal_tap("gsm_a,", gsm_a_stat_init
);
+ register_
stat_cmd_arg("gsm_a,", gsm_a_stat_init,NULL
);
}
}