From c82817bd38ce03d055b60cd135ba5e50dc6c2b11 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 9 Dec 2010 09:14:44 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 36 ------------------------------------ patches/select_src | 30 ++++++++++++++++++++++++++++-- 3 files changed, 31 insertions(+), 42 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index d3f0ce1..8b97b55 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 23bba74b9468644a830a37ead0f8bb6f77aeda21 -Head: af619b5e543b7539f3f8b4a0dd03352777dc9334 +Previous: 780943a0b5a74ff09b27c5cd76a96c73cad8a751 +Head: b66e2621de1b69be3e117864607532a9bcbcce32 Applied: locking: 49fcc60d268ba85ee40dc4a4e7d3a4faac3abe9b verbose: ab647a30aa155e72a51f9e7e228d558b8db6ec2a @@ -15,8 +15,7 @@ Applied: notes_man: 3d3b9ac02e0a3d11746b3ca601d4d73d918b411f def_log: f43faea8e7780d67919ebc6c1a435bcf3903e947 rm_acm_msg: 5aaf38cf02875897413ce853df5d01592aa10a17 - select_src: 03b0fee11d5e74ed62e30aae5e6b05e3b4d215f0 - refresh-temp: af619b5e543b7539f3f8b4a0dd03352777dc9334 + select_src: b66e2621de1b69be3e117864607532a9bcbcce32 Unapplied: 1.0.4: f8c16b55b0f82a6eb667a3ef82aca8cb4f8fd714 Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index e14ec64..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,36 +0,0 @@ -Bottom: 5367b34c78eebaff36d0f9720dcc10bd2f69ff4f -Top: df0fbab51106faef153cc1e0ade6cf8308bdfc55 -Author: Sean Hefty -Date: 2010-12-09 09:14:44 -0800 - -Refresh of select_src - ---- - -diff --git a/src/acm.c b/src/acm.c -index 67c4925..4ec01e8 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -1851,14 +1851,20 @@ static int acm_svr_select_src(struct acm_ep_addr_data *src, struct acm_ep_addr_d - - acm_log(2, "selecting source address\n"); - memset(&addr, 0, sizeof addr); -- if (dst->type == ACM_EP_INFO_ADDRESS_IP) { -+ switch (dst->type) { -+ case ACM_EP_INFO_ADDRESS_IP: - ((struct sockaddr_in *) &addr)->sin_family = AF_INET; - memcpy(&((struct sockaddr_in *) &addr)->sin_addr, dst->info.addr, 4); - len = sizeof(struct sockaddr_in); -- } else { -+ break; -+ case ACM_EP_INFO_ADDRESS_IP6: - addr.sin6_family = AF_INET6; - memcpy(&addr.sin6_addr, dst->info.addr, 16); - len = sizeof(struct sockaddr_in6); -+ break; -+ default: -+ acm_log(1, "notice - bad destination type, cannot lookup source\n"); -+ return ACM_STATUS_EDESTTYPE; - } - - s = socket(addr.sin6_family, SOCK_DGRAM, IPPROTO_UDP); diff --git a/patches/select_src b/patches/select_src index 205ad75..399dbf0 100644 --- a/patches/select_src +++ b/patches/select_src @@ -1,5 +1,5 @@ Bottom: 5367b34c78eebaff36d0f9720dcc10bd2f69ff4f -Top: 5367b34c78eebaff36d0f9720dcc10bd2f69ff4f +Top: df0fbab51106faef153cc1e0ade6cf8308bdfc55 Author: Sean Hefty Date: 2010-12-09 09:09:24 -0800 @@ -14,4 +14,30 @@ Signed-off-by: Sean Hefty --- - +diff --git a/src/acm.c b/src/acm.c +index 67c4925..4ec01e8 100644 +--- a/src/acm.c ++++ b/src/acm.c +@@ -1851,14 +1851,20 @@ static int acm_svr_select_src(struct acm_ep_addr_data *src, struct acm_ep_addr_d + + acm_log(2, "selecting source address\n"); + memset(&addr, 0, sizeof addr); +- if (dst->type == ACM_EP_INFO_ADDRESS_IP) { ++ switch (dst->type) { ++ case ACM_EP_INFO_ADDRESS_IP: + ((struct sockaddr_in *) &addr)->sin_family = AF_INET; + memcpy(&((struct sockaddr_in *) &addr)->sin_addr, dst->info.addr, 4); + len = sizeof(struct sockaddr_in); +- } else { ++ break; ++ case ACM_EP_INFO_ADDRESS_IP6: + addr.sin6_family = AF_INET6; + memcpy(&addr.sin6_addr, dst->info.addr, 16); + len = sizeof(struct sockaddr_in6); ++ break; ++ default: ++ acm_log(1, "notice - bad destination type, cannot lookup source\n"); ++ return ACM_STATUS_EDESTTYPE; + } + + s = socket(addr.sin6_family, SOCK_DGRAM, IPPROTO_UDP); -- 2.46.0