From: Dominik Paulus <[email protected]> Not all new program versions necessarily introduce non-backwards-compatible protocol changes. We thus move the definition of the protocol version from configure.ac to usbip_network.h, where it logically belongs to.
Signed-off-by: Maximilian Eschenbacher <[email protected]> Signed-off-by: Fjodor Schelichow <[email protected]> Signed-off-by: Johannes Stadlinger <[email protected]> Signed-off-by: Dominik Paulus <[email protected]> Signed-off-by: Tobias Polzer <[email protected]> --- tools/usb/usbip/configure.ac | 1 - tools/usb/usbip/src/usbip_network.c | 6 +++--- tools/usb/usbip/src/usbip_network.h | 6 ++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/usb/usbip/configure.ac b/tools/usb/usbip/configure.ac index 6a8156f..cee780e 100644 --- a/tools/usb/usbip/configure.ac +++ b/tools/usb/usbip/configure.ac @@ -2,7 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT([usbip-utils], [2.0], [[email protected]]) -AC_DEFINE([USBIP_VERSION], [0x00000111], [binary-coded decimal version number]) CURRENT=0 REVISION=1 diff --git a/tools/usb/usbip/src/usbip_network.c b/tools/usb/usbip/src/usbip_network.c index f68741d..6e6216d 100644 --- a/tools/usb/usbip/src/usbip_network.c +++ b/tools/usb/usbip/src/usbip_network.c @@ -157,7 +157,7 @@ int usbip_net_send_op_common(int sockfd, uint32_t code, uint32_t status) memset(&op_common, 0, sizeof(op_common)); - op_common.version = USBIP_VERSION; + op_common.version = PROTOCOL_VERSION; op_common.code = code; op_common.status = status; @@ -187,9 +187,9 @@ int usbip_net_recv_op_common(int sockfd, uint16_t *code) PACK_OP_COMMON(0, &op_common); - if (op_common.version != USBIP_VERSION) { + if (op_common.version != PROTOCOL_VERSION) { dbg("version mismatch: %d %d", op_common.version, - USBIP_VERSION); + PROTOCOL_VERSION); return -ERR_MISMATCH; } diff --git a/tools/usb/usbip/src/usbip_network.h b/tools/usb/usbip/src/usbip_network.h index 151e815..942d1bb 100644 --- a/tools/usb/usbip/src/usbip_network.h +++ b/tools/usb/usbip/src/usbip_network.h @@ -13,6 +13,12 @@ #include <stdint.h> +/* + * Protocol version. Incremented only on non-backwards-compatible + * changes. + */ +#define PROTOCOL_VERSION 0x111 + extern int usbip_port; extern char *usbip_port_string; extern char *usbip_srp_password; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
