diff options
| author |   rzalamena <rzalamena@openbsd.org> | 2016-11-22 13:01:32 +0000 |
|---|---|---|
| committer | rzalamena <rzalamena@openbsd.org> | 2016-11-22 13:01:32 +0000 |
| commit | 5cec6c3d5b6a5cd1544d37c75e2edf61575b2f1d (patch) | |
| tree | bc5ef03388146579ecbfcbc4907fad534ef73868 | |
| parent | There is no need for res when there is already ret. (diff) | |
| download | wireguard-openbsd-5cec6c3d5b6a5cd1544d37c75e2edf61575b2f1d.tar.xz wireguard-openbsd-5cec6c3d5b6a5cd1544d37c75e2edf61575b2f1d.zip | |
Fix OFP spelling for version bitmap define in ofp header and tcpdump, also
change the truncation message in hello with the standard one.
ok reyk@
| -rw-r--r-- | sys/net/ofp.h | 6 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/print-ofp.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/ofp.h b/sys/net/ofp.h index bc9022ded4e..73f4a730f58 100644 --- a/sys/net/ofp.h +++ b/sys/net/ofp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ofp.h,v 1.11 2016/11/20 12:45:26 reyk Exp $ */ +/* $OpenBSD: ofp.h,v 1.12 2016/11/22 13:01:32 rzalamena Exp $ */ /* * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org> @@ -86,7 +86,7 @@ struct ofp_hello_element_header { uint16_t he_length; } __packed; -#define OPF_HELLO_T_VERSION_BITMAP 1 /* Supported version bitmap */ +#define OFP_HELLO_T_VERSION_BITMAP 1 /* Supported version bitmap */ struct ofp_hello_element_versionbitmap { uint16_t hev_type; @@ -894,4 +894,4 @@ struct dlt_openflow_hdr { #define DLT_OPENFLOW_TO_SWITCH 1 #define DLT_OPENFLOW_TO_CONTROLLER 2 -#endif /* _NET_OPF_H_ */ +#endif /* _NET_OFP_H_ */ diff --git a/usr.sbin/tcpdump/print-ofp.c b/usr.sbin/tcpdump/print-ofp.c index 3cd0a47bbd8..a1e47f10b7e 100644 --- a/usr.sbin/tcpdump/print-ofp.c +++ b/usr.sbin/tcpdump/print-ofp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ofp.c,v 1.8 2016/11/20 12:45:26 reyk Exp $ */ +/* $OpenBSD: print-ofp.c,v 1.9 2016/11/22 13:01:32 rzalamena Exp $ */ /* * Copyright (c) 2016 Rafael Zalamena <rzalamena@openbsd.org> @@ -129,7 +129,7 @@ ofp_print_hello(const u_char *bp, u_int length, u_int ohlen) helen -= sizeof(*he); switch (hetype) { - case OPF_HELLO_T_VERSION_BITMAP: + case OFP_HELLO_T_VERSION_BITMAP: printf(" version bitmap <"); if (helen < sizeof(bmp)) { printf("invalid header>"); @@ -138,7 +138,7 @@ ofp_print_hello(const u_char *bp, u_int length, u_int ohlen) next_bitmap: if (length < sizeof(bmp)) { - printf("truncated>"); + printf("[|OpenFlow]>"); break; } |