From 445578d7709ae1fa8dc28d72312b59d6e298c946 Mon Sep 17 00:00:00 2001 From: zhanglianghy Date: Wed, 7 Aug 2019 14:36:23 +0800 Subject: [PATCH] =?UTF-8?q?MOD=20aaa-12=20=E6=A1=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3,?= =?UTF-8?q?=E6=A1=A5=E6=8E=A5=E5=8F=A3=E5=88=9B=E5=BB=BA=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E8=87=AA=E5=8A=A8up=20SOL=20=20=E6=A1=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Azhangliang=20=E6=A3=80?= =?UTF-8?q?=E8=A7=86=E4=BA=BA=EF=BC=9Azhangliang?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{netconfig => include}/netconfig.h | 4 +- .../config-server/netconfig/ifconfig.c | 144 +----------------- .../netconfig/ipconfig/ipconfig.c | 134 +++++++++++++++- .../configm/config-server/netconfig/netmain.c | 1 + 4 files changed, 140 insertions(+), 143 deletions(-) rename Platform/user/configm/config-server/{netconfig => include}/netconfig.h (52%) diff --git a/Platform/user/configm/config-server/netconfig/netconfig.h b/Platform/user/configm/config-server/include/netconfig.h similarity index 52% rename from Platform/user/configm/config-server/netconfig/netconfig.h rename to Platform/user/configm/config-server/include/netconfig.h index 9daa2937b..a7ea8ce78 100644 --- a/Platform/user/configm/config-server/netconfig/netconfig.h +++ b/Platform/user/configm/config-server/include/netconfig.h @@ -3,9 +3,7 @@ #include "ipconfig.h" #include "brconfig.h" -ret_code if_set_prefix(ip_config_t *ip_conf, int *code); -ret_code if_get_prefix_all(pointer output, int *output_len, int *code); -ret_code if_get_prefix(ip_config_t *ip_conf, int *code); +ret_code if_ioctl(unsigned long request, caddr_t ifreq, int *ret); ret_code if_set_up(char *ifname, int *code); ret_code if_set_down(char *ifname, int *code); diff --git a/Platform/user/configm/config-server/netconfig/ifconfig.c b/Platform/user/configm/config-server/netconfig/ifconfig.c index 638c4ad40..d3efe34bb 100644 --- a/Platform/user/configm/config-server/netconfig/ifconfig.c +++ b/Platform/user/configm/config-server/netconfig/ifconfig.c @@ -14,7 +14,6 @@ #include #include "rpc.h" -#include "ipconfig.h" /* call ioctl system call */ ret_code if_ioctl(unsigned long request, caddr_t ifreq, int *ret) @@ -62,13 +61,13 @@ static int if_set_flag(char *ifname, short flag, int *code) strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); - ret = if_ioctl(SIOCGIFFLAGS, &ifr, code); + ret = if_ioctl(SIOCGIFFLAGS, (caddr_t)&ifr, code); ASSERT_RET(ret); strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); ifr.ifr_flags |= flag; - ret = if_ioctl(SIOCSIFFLAGS, &ifr, code); + ret = if_ioctl(SIOCSIFFLAGS, (caddr_t)&ifr, code); ASSERT_RET(ret); return ret; @@ -81,151 +80,20 @@ static int if_clear_flag(char *ifname, short flag, int *code) struct ifreq ifr = {0}; ret_code ret; - safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); - ret = if_ioctl(SIOCGIFFLAGS, &ifr, code); + ret = if_ioctl(SIOCGIFFLAGS, (caddr_t)&ifr, code); ASSERT_RET(ret); - safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); ifr.ifr_flags &= ~flag; - ret = if_ioctl(SIOCSIFFLAGS, &ifr) + ret = if_ioctl(SIOCSIFFLAGS, (caddr_t)&ifr, code); ASSERT_RET(ret); return ret; } -ret_code if_set_prefix(ip_config_t *ip_conf, int *code) -{ - ret_code ret; - struct ifreq ifreq = {0}; - struct sockaddr_in addr; - struct sockaddr_in mask; - - strncpy(ifreq.ifr_name, ip_conf->ifname, sizeof(ifreq.ifr_name) - 1); - addr.sin_addr = ip_conf->prefix; - addr.sin_family = ip_conf->family; - memcpy(&ifreq.ifr_addr, &addr, sizeof(struct sockaddr_in)); - - ret = if_ioctl(SIOCSIFADDR, (caddr_t)&ifreq, code); - ASSERT_RET(ret); - - if(ip_conf->prefix.s_addr != 0) - { - masklen2ip(ip_conf->prefixlen, &mask.sin_addr); - mask.sin_family = ip_conf->family; - memcpy(&ifreq.ifr_netmask, &mask, sizeof(struct sockaddr_in)); - - ret = if_ioctl(SIOCSIFNETMASK, (caddr_t)&ifreq, code); - ASSERT_RET(ret); - } - - - return RET_OK; -} - -ret_code if_get_prefix_all(pointer output, int *output_len, int *code) -{ - struct ifreq ifreq[MAX_IF_NUM]; - struct sockaddr_in *addr; - struct ifreq netmask; - ip_config_t *ip_conf; - struct ifconf ifc; - int if_count = 0; - ret_code ret; - int mask_ret; - int i; - - memset(&ifc, 0, sizeof(struct ifconf)); - memset(&ifreq, 0, MAX_IF_NUM * sizeof(struct ifreq)); - - ifc.ifc_len = MAX_IF_NUM * sizeof(struct ifreq); - ifc.ifc_buf = (char *)ifreq; - - ret = if_ioctl(SIOCGIFCONF, (caddr_t)&ifc, code); - ASSERT_RET(ret); - - if_count = ifc.ifc_len / (sizeof(struct ifreq)); - - rpc_log_info("if num is %d\n", if_count); - - if((if_count * sizeof(ip_config_t) > CM_BUFF_SIZE) - || (if_count == 0)) - { - ret = RET_NOMEM; - ASSERT_RET(ret); - } - - ip_conf = rpc_new(ip_config_t, MAX_IF_NUM); - if(ip_conf == NULL) - { - return RET_NOMEM; - } - memset(ip_conf, 0, MAX_IF_NUM * sizeof(ip_config_t)); - - for(i = 0; i < if_count; i++) - { - rpc_log_info("get interface %s info\n", ifreq[i].ifr_name); - strncpy(ip_conf[i].ifname, ifreq[i].ifr_name, INTERFACE_NAMSIZ - 1); - ip_conf[i].family = AF_INET; - ip_conf[i].prefix = ((struct sockaddr_in *)&(ifreq[i].ifr_addr))->sin_addr; - - memset(&netmask, 0, sizeof(netmask)); - strncpy(netmask.ifr_name, ifreq[i].ifr_name, sizeof(netmask.ifr_name) - 1); - - ret = if_ioctl(SIOCGIFNETMASK, (caddr_t)&netmask, &mask_ret); - ASSERT_RET_NO(ret); - - addr = ( struct sockaddr_in * )&(netmask.ifr_netmask ); - ip_conf[i].prefixlen = ip_masklen(addr->sin_addr); - } - - ip_config_format_json_array(CM_CONFIG_GET, ip_conf, if_count, output, output_len); - - rpc_free(ip_conf); - return RET_OK; -} - -ret_code if_get_prefix(ip_config_t *ip_conf, int *code) -{ - struct sockaddr_in *addr; - struct ifreq netmask; - struct ifreq ifreq; - ret_code ret = RET_OK; - int mask_ret; - int i; - - if(ip_conf->family != AF_INET) - { - ret = RET_INPUTERR; - } - - ASSERT_RET(ret); - - memset(&ifreq, 0, sizeof(struct ifreq)); - - rpc_log_info("get interface %s info\n", ip_conf->ifname); - - strncpy(ifreq.ifr_name, ip_conf->ifname, sizeof(ifreq.ifr_name) - 1); - - ret = if_ioctl(SIOCGIFADDR, (caddr_t)&ifreq, code); - ASSERT_RET(ret); - - - ip_conf->prefix = ((struct sockaddr_in *)&(ifreq.ifr_addr))->sin_addr; - - memset(&ifreq, 0, sizeof(ifreq)); - strncpy(ifreq.ifr_name, ip_conf->ifname, sizeof(ifreq.ifr_name) - 1); - - ret = if_ioctl(SIOCGIFNETMASK, (caddr_t)&ifreq, &mask_ret); - ASSERT_RET_NO(ret); - - addr = ( struct sockaddr_in * )&(ifreq.ifr_netmask); - ip_conf->prefixlen = ip_masklen(addr->sin_addr); - - return ret; -} - ret_code if_set_up(char *ifname, int *code) { return if_set_flag(ifname, (IFF_UP | IFF_RUNNING), code); diff --git a/Platform/user/configm/config-server/netconfig/ipconfig/ipconfig.c b/Platform/user/configm/config-server/netconfig/ipconfig/ipconfig.c index 0838d7bb8..e2ee3dbdd 100644 --- a/Platform/user/configm/config-server/netconfig/ipconfig/ipconfig.c +++ b/Platform/user/configm/config-server/netconfig/ipconfig/ipconfig.c @@ -1,5 +1,4 @@ #include "configm.h" -#include "ipconfig.h" #include "rpc.h" #include "parsefile.h" #include "netconfig.h" @@ -62,7 +61,6 @@ void ip_save_file(ip_config_t *ip_conf, uint config_type) } } - ret_code ip_config_json_parse(pointer input, uint *conf_type, ip_config_t *config_buff) { //ip_config_string_t *ip_config; @@ -258,6 +256,138 @@ ret_code ip_config_format_json_array(int config_type, ip_config_t *config_buff, return RET_OK; } + +ret_code if_set_prefix(ip_config_t *ip_conf, int *code) +{ + ret_code ret; + struct ifreq ifreq = {0}; + struct sockaddr_in addr; + struct sockaddr_in mask; + + strncpy(ifreq.ifr_name, ip_conf->ifname, sizeof(ifreq.ifr_name) - 1); + addr.sin_addr = ip_conf->prefix; + addr.sin_family = ip_conf->family; + memcpy(&ifreq.ifr_addr, &addr, sizeof(struct sockaddr_in)); + + ret = if_ioctl(SIOCSIFADDR, (caddr_t)&ifreq, code); + ASSERT_RET(ret); + + if(ip_conf->prefix.s_addr != 0) + { + masklen2ip(ip_conf->prefixlen, &mask.sin_addr); + mask.sin_family = ip_conf->family; + memcpy(&ifreq.ifr_netmask, &mask, sizeof(struct sockaddr_in)); + + ret = if_ioctl(SIOCSIFNETMASK, (caddr_t)&ifreq, code); + ASSERT_RET(ret); + } + + return RET_OK; +} + +ret_code if_get_prefix(ip_config_t *ip_conf, int *code) +{ + struct sockaddr_in *addr; + struct ifreq netmask; + struct ifreq ifreq; + ret_code ret = RET_OK; + int mask_ret; + int i; + + if(ip_conf->family != AF_INET) + { + ret = RET_INPUTERR; + } + + ASSERT_RET(ret); + + memset(&ifreq, 0, sizeof(struct ifreq)); + + rpc_log_info("get interface %s info\n", ip_conf->ifname); + + strncpy(ifreq.ifr_name, ip_conf->ifname, sizeof(ifreq.ifr_name) - 1); + + ret = if_ioctl(SIOCGIFADDR, (caddr_t)&ifreq, code); + ASSERT_RET(ret); + + + ip_conf->prefix = ((struct sockaddr_in *)&(ifreq.ifr_addr))->sin_addr; + + memset(&ifreq, 0, sizeof(ifreq)); + strncpy(ifreq.ifr_name, ip_conf->ifname, sizeof(ifreq.ifr_name) - 1); + + ret = if_ioctl(SIOCGIFNETMASK, (caddr_t)&ifreq, &mask_ret); + ASSERT_RET_NO(ret); + + addr = ( struct sockaddr_in * )&(ifreq.ifr_netmask); + ip_conf->prefixlen = ip_masklen(addr->sin_addr); + + return ret; +} + +ret_code if_get_prefix_all(pointer output, int *output_len, int *code) +{ + struct ifreq ifreq[MAX_IF_NUM]; + struct sockaddr_in *addr; + struct ifreq netmask; + ip_config_t *ip_conf; + struct ifconf ifc; + int if_count = 0; + ret_code ret; + int mask_ret; + int i; + + memset(&ifc, 0, sizeof(struct ifconf)); + memset(&ifreq, 0, MAX_IF_NUM * sizeof(struct ifreq)); + + ifc.ifc_len = MAX_IF_NUM * sizeof(struct ifreq); + ifc.ifc_buf = (char *)ifreq; + + ret = if_ioctl(SIOCGIFCONF, (caddr_t)&ifc, code); + ASSERT_RET(ret); + + if_count = ifc.ifc_len / (sizeof(struct ifreq)); + + rpc_log_info("if num is %d\n", if_count); + + if((if_count * sizeof(ip_config_t) > CM_BUFF_SIZE) + || (if_count == 0)) + { + ret = RET_NOMEM; + ASSERT_RET(ret); + } + + ip_conf = rpc_new(ip_config_t, MAX_IF_NUM); + if(ip_conf == NULL) + { + return RET_NOMEM; + } + memset(ip_conf, 0, MAX_IF_NUM * sizeof(ip_config_t)); + + for(i = 0; i < if_count; i++) + { + rpc_log_info("get interface %s info\n", ifreq[i].ifr_name); + strncpy(ip_conf[i].ifname, ifreq[i].ifr_name, INTERFACE_NAMSIZ - 1); + ip_conf[i].family = AF_INET; + ip_conf[i].prefix = ((struct sockaddr_in *)&(ifreq[i].ifr_addr))->sin_addr; + + memset(&netmask, 0, sizeof(netmask)); + strncpy(netmask.ifr_name, ifreq[i].ifr_name, sizeof(netmask.ifr_name) - 1); + + ret = if_ioctl(SIOCGIFNETMASK, (caddr_t)&netmask, &mask_ret); + ASSERT_RET_NO(ret); + + addr = ( struct sockaddr_in * )&(netmask.ifr_netmask ); + ip_conf[i].prefixlen = ip_masklen(addr->sin_addr); + } + + ip_config_format_json_array(CM_CONFIG_GET, ip_conf, if_count, output, output_len); + + rpc_free(ip_conf); + return RET_OK; +} + + ret_code ip_config_set_chk(uint source,uint config_type, pointer input, int input_len, pointer output, int *output_len) diff --git a/Platform/user/configm/config-server/netconfig/netmain.c b/Platform/user/configm/config-server/netconfig/netmain.c index f0f33e7cf..88cd44c8a 100644 --- a/Platform/user/configm/config-server/netconfig/netmain.c +++ b/Platform/user/configm/config-server/netconfig/netmain.c @@ -1,3 +1,4 @@ +#include "rpc.h" #include "netconfig.h"