From b6f35abd403db19c59c716916ff7bb675fd812aa Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Fri, 24 Apr 2015 16:49:01 +0000 Subject: [PATCH] sock_addrtostr defined again. FossilOrigin-Name: e7cd71664a28417065e3fd34765d38d0d56b57817b3933067be856da2c82b716 --- src/capwap/sock.h | 2 +- src/wtp/cfg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/capwap/sock.h b/src/capwap/sock.h index 6b7dceb6..12e01eb0 100644 --- a/src/capwap/sock.h +++ b/src/capwap/sock.h @@ -63,7 +63,7 @@ char *sock_strsockaddr(const struct sockaddr *sa, char *s, size_t maxlen,int add #define sock_addr2str(s) ( sock_strsockaddr( (struct sockaddr*)s, (char[64]){0}, 64,0 ) ) #define sock_hwaddr2str(s,l) ( sock_hwaddrtostr( s,l, (char[64]){0}, ":" ) ) #define sock_hwaddr2idstr(s,l) ( sock_hwaddrtostr( s,l, (char[64]){0}, "" ) ) - +#define sock_addrtostr(s,str,n) sock_strsockaddr(s,str,n,1) #define sock_addrfamily(addr) ( ((struct sockaddr_storage*)(addr))->ss_family ) diff --git a/src/wtp/cfg.json b/src/wtp/cfg.json index 6765e48c..43415778 100644 --- a/src/wtp/cfg.json +++ b/src/wtp/cfg.json @@ -1,6 +1,6 @@ { "idle_timeout":"300", - "wtp_name":"Kaffe-Point", + "wtp_name":"Kaffe-Point22", "hardware_version":["4232704",".x01000000"], "software_version":["4232704",".x08006e00"], "wtp_board_data":{