deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix IP-Address output (endianness!)

Browse source
This commit is contained in:
Ralf Schlatterbeck 2015-01-27 16:41:30 +01:00
parent 5ff9b7c989
commit 451e2df0f5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/osd/poti/poti.c
View file

@ -65,6 +65,8 @@ extern resource_t res_radio;
#endif #endif
#define REMOTE_PORT UIP_HTONS(COAP_DEFAULT_PORT) #define REMOTE_PORT UIP_HTONS(COAP_DEFAULT_PORT)
// should be the same :-)
#define UIP_NTOHS(x) UIP_HTONS(x)
#define SERVER_NODE(ip) \ #define SERVER_NODE(ip) \
uip_ip6addr(ip,0xfe80,0,0,0,0x22e,0xffff,0x34,0xa600) uip_ip6addr(ip,0xfe80,0,0,0,0x22e,0xffff,0x34,0xa600)
/*uip_ip6addr(ip,0x2001,0xdb8,0xc001,0xf00d,0x22e,0xffff,0x34,0xa600)*/ /*uip_ip6addr(ip,0x2001,0xdb8,0xc001,0xf00d,0x22e,0xffff,0x34,0xa600)*/
@ -77,13 +79,13 @@ int interval = 10; /* Retransmit interval after no change in value */
static size_t static size_t
ip_to_string (const char *name, uint8_t is_json, char *buf, size_t bsize) ip_to_string (const char *name, uint8_t is_json, char *buf, size_t bsize)
{ {
#define IP(x) server_ipaddr.u16[x] #define IP(x) UIP_NTOHS(server_ipaddr.u16[x])
char *q = "\""; char *q = "\"";
if (!is_json) { if (!is_json) {
q = ""; q = "";
} }
return snprintf return snprintf
( buf, bsize, "%s%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x%s" ( buf, bsize, "%s%x:%x:%x:%x:%x:%x:%x:%x%s"
, q, IP(0), IP(1), IP(2), IP(3), IP(4), IP(5), IP(6), IP(7), q , q, IP(0), IP(1), IP(2), IP(3), IP(4), IP(5), IP(6), IP(7), q
); );
} }