From 785ab99f18627f1173c9e1714551577c901f04ed Mon Sep 17 00:00:00 2001 From: Charles Chance Date: Wed, 15 Jul 2015 09:48:57 +0100 Subject: [PATCH] dmq_usrloc: use new version of serialized structure returned by usrloc (now includes received address) (cherry picked from commit bc01d8d6c6abfc7912a27df3ac23bffd818758e9) --- modules/dmq_usrloc/usrloc_sync.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 7d1cf45bcef..3bd0c245fe2 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -96,7 +96,7 @@ void usrloc_get_all_ucontact(dmq_node_t* node) { int rval, len=0; void *buf, *cp; - str c; + str c, recv; str path; str ruid; unsigned int aorhash; @@ -145,6 +145,9 @@ void usrloc_get_all_ucontact(dmq_node_t* node) break; c.s = (char*)cp + sizeof(c.len); cp = (char*)cp + sizeof(c.len) + c.len; + memcpy(&(recv.len), cp, sizeof(recv.len)); + recv.s = (char*)cp + sizeof(recv.len); + cp = (char*)cp + sizeof(recv.len) + recv.len; memcpy( &send_sock, cp, sizeof(send_sock)); cp = (char*)cp + sizeof(send_sock); memcpy( &flags, cp, sizeof(flags));