diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-09-22 02:00:38 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-09-22 02:00:38 +0000 |
| commit | 505e73ec393fef3c16c044c81d5b1afbd3037bad (patch) | |
| tree | f7bb20c2ddac9950a69f73ec8a8062b6fec82c79 /tethereal.c | |
| parent | b093cc3697db80513886c96fbd8b9b20fde41084 (diff) | |
Libpcap uses u_char; use it in our calls to libpcap routines and in our
libpcap callback routine (if it's not getting defined, <pcap.h> doesn't
work).
svn path=/trunk/; revision=15952
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tethereal.c b/tethereal.c index 51fdea52d3..da4c3dff6d 100644 --- a/tethereal.c +++ b/tethereal.c @@ -170,8 +170,8 @@ static gboolean infoprint; /* if TRUE, print capture info after clearing infodel static int capture(char *, int); -static void capture_pcap_cb(guchar *, const struct pcap_pkthdr *, - const guchar *); +static void capture_pcap_cb(u_char *, const struct pcap_pkthdr *, + const u_char *); static void report_counts(void); #ifdef _WIN32 static BOOL WINAPI capture_cleanup(DWORD); @@ -1807,7 +1807,7 @@ capture(char *save_file, int out_file_type) errmsg, sizeof errmsg); } else #endif - inpkts = pcap_dispatch(ld.pch, pcap_cnt, capture_pcap_cb, (guchar *) &ld); + inpkts = pcap_dispatch(ld.pch, pcap_cnt, capture_pcap_cb, (u_char *) &ld); if (inpkts < 0) { /* Error from "pcap_dispatch()", or error or "no more packets" from "pipe_dispatch(). */ @@ -1951,8 +1951,8 @@ error: } static void -capture_pcap_cb(guchar *user, const struct pcap_pkthdr *phdr, - const guchar *pd) +capture_pcap_cb(u_char *user, const struct pcap_pkthdr *phdr, + const u_char *pd) { struct wtap_pkthdr whdr; union wtap_pseudo_header pseudo_header; @@ -3293,7 +3293,7 @@ pipe_dispatch(int fd, loop_data *ldat, struct pcap_hdr *hdr, phdr.caplen = rechdr->hdr.incl_len; phdr.len = rechdr->hdr.orig_len; - capture_pcap_cb((guchar *)ldat, &phdr, data); + capture_pcap_cb((u_char *)ldat, &phdr, data); ldat->pipe_state = STATE_EXPECT_REC_HDR; return 1; |