Deleted Added
sdiff udiff text old ( 39300 ) new ( 56896 )
full compact
print-llc.c (39300) print-llc.c (56896)
1/*
2 * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 6 unchanged lines hidden (view full) ---

15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * Code by Matt Thomas, Digital Equipment Corporation
22 * with an awful lot of hacking by Jeffrey Mogul, DECWRL
1/*
2 * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 6 unchanged lines hidden (view full) ---

15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * Code by Matt Thomas, Digital Equipment Corporation
22 * with an awful lot of hacking by Jeffrey Mogul, DECWRL
23 *
24 * $FreeBSD: head/contrib/tcpdump/print-llc.c 56896 2000-01-30 01:05:24Z fenner $
23 */
24
25#ifndef lint
26static const char rcsid[] =
25 */
26
27#ifndef lint
28static const char rcsid[] =
27 "@(#) $Header: print-llc.c,v 1.24 97/01/01 20:56:48 leres Exp $";
29 "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.27 1999/12/22 06:27:21 itojun Exp $";
28#endif
29
30#endif
31
32#ifdef HAVE_CONFIG_H
33#include "config.h"
34#endif
35
30#include <sys/param.h>
31#include <sys/time.h>
32
33#include <netinet/in.h>
34
35#include <ctype.h>
36#include <netdb.h>
37#include <stdio.h>

--- 36 unchanged lines hidden (view full) ---

74
75 /* Watch out for possible alignment problems */
76 memcpy((char *)&llc, (char *)p, min(caplen, sizeof(llc)));
77
78 if (llc.ssap == LLCSAP_GLOBAL && llc.dsap == LLCSAP_GLOBAL) {
79 ipx_print(p, length);
80 return (1);
81 }
36#include <sys/param.h>
37#include <sys/time.h>
38
39#include <netinet/in.h>
40
41#include <ctype.h>
42#include <netdb.h>
43#include <stdio.h>

--- 36 unchanged lines hidden (view full) ---

80
81 /* Watch out for possible alignment problems */
82 memcpy((char *)&llc, (char *)p, min(caplen, sizeof(llc)));
83
84 if (llc.ssap == LLCSAP_GLOBAL && llc.dsap == LLCSAP_GLOBAL) {
85 ipx_print(p, length);
86 return (1);
87 }
82#ifdef notyet
83 else if (p[0] == 0xf0 && p[1] == 0xf0)
84 netbios_print(p, length);
85#endif
88 if (llc.ssap == 0xf0 && llc.dsap == 0xf0) {
89 /*
90 * we don't actually have a full netbeui parser yet, but the
91 * smb parser can handle many smb-in-netbeui packets, which
92 * is very useful, so we call that
93 */
94 netbeui_print(p + 2, p + min(caplen, length));
95 return (1);
96 }
86 if (llc.ssap == LLCSAP_ISONS && llc.dsap == LLCSAP_ISONS
87 && llc.llcui == LLC_UI) {
88 isoclns_print(p + 3, length - 3, caplen - 3, esrc, edst);
89 return (1);
90 }
91
92 if (llc.ssap == LLCSAP_SNAP && llc.dsap == LLCSAP_SNAP
93 && llc.llcui == LLC_UI) {
94 if (caplen < sizeof(llc)) {
97 if (llc.ssap == LLCSAP_ISONS && llc.dsap == LLCSAP_ISONS
98 && llc.llcui == LLC_UI) {
99 isoclns_print(p + 3, length - 3, caplen - 3, esrc, edst);
100 return (1);
101 }
102
103 if (llc.ssap == LLCSAP_SNAP && llc.dsap == LLCSAP_SNAP
104 && llc.llcui == LLC_UI) {
105 if (caplen < sizeof(llc)) {
95 (void)printf("[|llc-snap]");
96 default_print((u_char *)p, caplen);
97 return (0);
106 (void)printf("[|llc-snap]");
107 default_print((u_char *)p, caplen);
108 return (0);
98 }
99 if (vflag)
100 (void)printf("snap %s ", protoid_string(llc.llcpi));
101
102 caplen -= sizeof(llc);
103 length -= sizeof(llc);
104 p += sizeof(llc);
105

--- 25 unchanged lines hidden (view full) ---

131 llcsap_string(llc.dsap));
132 }
133
134 if ((llc.llcu & LLC_U_FMT) == LLC_U_FMT) {
135 const char *m;
136 char f;
137 m = tok2str(cmd2str, "%02x", LLC_U_CMD(llc.llcu));
138 switch ((llc.ssap & LLC_GSAP) | (llc.llcu & LLC_U_POLL)) {
109 }
110 if (vflag)
111 (void)printf("snap %s ", protoid_string(llc.llcpi));
112
113 caplen -= sizeof(llc);
114 length -= sizeof(llc);
115 p += sizeof(llc);
116

--- 25 unchanged lines hidden (view full) ---

142 llcsap_string(llc.dsap));
143 }
144
145 if ((llc.llcu & LLC_U_FMT) == LLC_U_FMT) {
146 const char *m;
147 char f;
148 m = tok2str(cmd2str, "%02x", LLC_U_CMD(llc.llcu));
149 switch ((llc.ssap & LLC_GSAP) | (llc.llcu & LLC_U_POLL)) {
139 case 0: f = 'C'; break;
140 case LLC_GSAP: f = 'R'; break;
141 case LLC_U_POLL: f = 'P'; break;
142 case LLC_GSAP|LLC_U_POLL: f = 'F'; break;
143 default: f = '?'; break;
150 case 0: f = 'C'; break;
151 case LLC_GSAP: f = 'R'; break;
152 case LLC_U_POLL: f = 'P'; break;
153 case LLC_GSAP|LLC_U_POLL: f = 'F'; break;
154 default: f = '?'; break;
144 }
145
146 printf("%s/%c", m, f);
147
148 p += 3;
149 length -= 3;
150 caplen -= 3;
151
152 if ((llc.llcu & ~LLC_U_POLL) == LLC_XID) {
155 }
156
157 printf("%s/%c", m, f);
158
159 p += 3;
160 length -= 3;
161 caplen -= 3;
162
163 if ((llc.llcu & ~LLC_U_POLL) == LLC_XID) {
153 if (*p == LLC_XID_FI) {
154 printf(": %02x %02x", p[1], p[2]);
155 p += 3;
156 length -= 3;
157 caplen -= 3;
158 }
164 if (*p == LLC_XID_FI) {
165 printf(": %02x %02x", p[1], p[2]);
166 p += 3;
167 length -= 3;
168 caplen -= 3;
169 }
159 }
170 }
171
172 if (!strcmp(m,"ui") && f=='C') {
173 /*
174 * we don't have a proper ipx decoder yet, but there
175 * is a partial one in the smb code
176 */
177 ipx_netbios_print(p,p+min(caplen,length));
178 }
179
160 } else {
161 char f;
162 llc.llcis = ntohs(llc.llcis);
163 switch ((llc.ssap & LLC_GSAP) | (llc.llcu & LLC_U_POLL)) {
180 } else {
181 char f;
182 llc.llcis = ntohs(llc.llcis);
183 switch ((llc.ssap & LLC_GSAP) | (llc.llcu & LLC_U_POLL)) {
164 case 0: f = 'C'; break;
165 case LLC_GSAP: f = 'R'; break;
166 case LLC_U_POLL: f = 'P'; break;
167 case LLC_GSAP|LLC_U_POLL: f = 'F'; break;
168 default: f = '?'; break;
184 case 0: f = 'C'; break;
185 case LLC_GSAP: f = 'R'; break;
186 case LLC_U_POLL: f = 'P'; break;
187 case LLC_GSAP|LLC_U_POLL: f = 'F'; break;
188 default: f = '?'; break;
169 }
170
171 if ((llc.llcu & LLC_S_FMT) == LLC_S_FMT) {
172 static char *llc_s[] = { "rr", "rej", "rnr", "03" };
173 (void)printf("%s (r=%d,%c)",
174 llc_s[LLC_S_CMD(llc.llcis)],
175 LLC_IS_NR(llc.llcis),
176 f);

--- 16 unchanged lines hidden --- 		189 }
190
191 if ((llc.llcu & LLC_S_FMT) == LLC_S_FMT) {
192 static char *llc_s[] = { "rr", "rej", "rnr", "03" };
193 (void)printf("%s (r=%d,%c)",
194 llc_s[LLC_S_CMD(llc.llcis)],
195 LLC_IS_NR(llc.llcis),
196 f);

--- 16 unchanged lines hidden ---