Version: 1
-Previous: 02b17b57a20ccbe349029346657b9ed1999f8196
-Head: aeda547b8b79f4ba0ff0db9442a0372f9fb0b324
+Previous: 5651ebd452b7e56a83e8ce9a79446849aab590c6
+Head: 98c3e5fdd72ffbd86fa5c0cdec79f210adf2e348
Applied:
acm_snoop: 6d9b27b37026f9090ad55a36f26814f90f3772dd
log_lid: 6ac592a74d5289b4800c84ef8c20e8ff3f2f263e
logging: 4ca254f3d8fda6ae709f0c38461f75b9677fa5df
- dest_string: 9bdc367c8d6d3498665bc852503915f7bd4822f2
- refresh-temp: aeda547b8b79f4ba0ff0db9442a0372f9fb0b324
+ dest_string: 98c3e5fdd72ffbd86fa5c0cdec79f210adf2e348
Unapplied:
loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
Hidden:
Bottom: 9962a940efd219c52418715f8e1c4d496699b292
-Top: 5d1d9b6d34aa20e4f12b23935ba93a3fe47886aa
+Top: 47378cdb2e1152902e00ec13bd915b1ec030aca5
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2010-11-15 14:42:59 -0800
{\r
pthread_t thread;\r
diff --git a/src/acm.c b/src/acm.c
-index daa0985..62623f1 100644
+index daa0985..6d83105 100644
--- a/src/acm.c
+++ b/src/acm.c
@@ -75,6 +75,7 @@ enum acm_route_prot
uint8_t *recv_bufs;
DLIST_ENTRY entry;
union acm_ep_info addr[MAX_EP_ADDR];
-+ char name[MAX_EP_ADDR];
++ char name[MAX_EP_ADDR][MAX_ACM_ADDRESS];
uint8_t addr_type[MAX_EP_ADDR];
void *dest_map[ACM_ADDRESS_RESERVED - 1];
struct acm_dest mc_dest[MAX_EP_MC];
ep->addr_type[index] = type;
acm_log(1, "assigning %s\n", addr);
-+ strncpy(ep->name, addr, ACM_MAX_ADDRESS);
++ strncpy(ep->name[index], addr, ACM_MAX_ADDRESS);
if (type == ACM_ADDRESS_IP)
memcpy(ep->addr[index].addr, &ip_addr, 4);
else if (type == ACM_ADDRESS_IP6)
+++ /dev/null
-Bottom: 5d1d9b6d34aa20e4f12b23935ba93a3fe47886aa
-Top: 47378cdb2e1152902e00ec13bd915b1ec030aca5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2010-11-15 17:17:15 -0800
-
-Refresh of dest_string
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 62623f1..6d83105 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -136,7 +136,7 @@ struct acm_ep
- uint8_t *recv_bufs;
- DLIST_ENTRY entry;
- union acm_ep_info addr[MAX_EP_ADDR];
-- char name[MAX_EP_ADDR];
-+ char name[MAX_EP_ADDR][MAX_ACM_ADDRESS];
- uint8_t addr_type[MAX_EP_ADDR];
- void *dest_map[ACM_ADDRESS_RESERVED - 1];
- struct acm_dest mc_dest[MAX_EP_MC];
-@@ -2275,7 +2275,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
-
- ep->addr_type[index] = type;
- acm_log(1, "assigning %s\n", addr);
-- strncpy(ep->name, addr, ACM_MAX_ADDRESS);
-+ strncpy(ep->name[index], addr, ACM_MAX_ADDRESS);
- if (type == ACM_ADDRESS_IP)
- memcpy(ep->addr[index].addr, &ip_addr, 4);
- else if (type == ACM_ADDRESS_IP6)