From 962acc3313d611a886b764135db01572e0206c4d Mon Sep 17 00:00:00 2001 From: longtengmcu Date: Sun, 22 Nov 2020 20:05:53 +0800 Subject: 1、修改宏定义的拼写错误，修改打印IMEI号时的打印错误 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/net/netdev/src/netdev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'components/net/netdev/src/netdev.c') diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index aa43d8d3db..646d2dfdd1 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -856,7 +856,7 @@ void netdev_low_level_set_dhcp_status(struct netdev *netdev, rt_bool_t is_enable static void netdev_list_if(void) { #define NETDEV_IFCONFIG_MAC_MAX_LEN 6 -#define NETDEV_IFCONFIG_IEMI_MAX_LEN 8 +#define NETDEV_IFCONFIG_IMEI_MAX_LEN 8 rt_ubase_t index; rt_slist_t *node = RT_NULL; @@ -894,9 +894,15 @@ static void netdev_list_if(void) { /* two numbers are displayed at one time*/ if (netdev->hwaddr[index] < 10 && index != netdev->hwaddr_len - 1) - rt_kprintf("0"); - - rt_kprintf("%d", netdev->hwaddr[index]); + { + rt_kprintf("%02d", netdev->hwaddr[index]); + } + else + { + rt_kprintf("%d", netdev->hwaddr[index]); + } + + } } -- cgit v1.3.1 From 82eac7106435a5fedf0a267f787b25d33083c2be Mon Sep 17 00:00:00 2001 From: thread-liu Date: Thu, 10 Dec 2020 09:12:55 +0800 Subject: [update] Incorrect macro definition name and update jobs name. --- .github/workflows/action.yml | 1 + components/net/netdev/src/netdev.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'components/net/netdev/src/netdev.c') diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 001566c0aa..8335ee1b6a 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -24,6 +24,7 @@ on: jobs: build: runs-on: ubuntu-latest + name: ${{ matrix.legs.RTT_BSP }} strategy: fail-fast: false matrix: diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index 646d2dfdd1..04bf6e8ad7 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -887,7 +887,7 @@ static void netdev_list_if(void) rt_kprintf("%02x ", netdev->hwaddr[index]); } } - else if (netdev->hwaddr_len == NETDEV_IFCONFIG_IEMI_MAX_LEN) + else if (netdev->hwaddr_len == NETDEV_IFCONFIG_IMEI_MAX_LEN) { rt_kprintf("IMEI: "); for (index = 0; index < netdev->hwaddr_len; index++) -- cgit v1.3.1 From 963f35e96d9ae16d9e3a66a2760bd5c8138cf211 Mon Sep 17 00:00:00 2001 From: liuduanfei <939763442@qq.com> Date: Fri, 18 Dec 2020 20:53:33 +0800 Subject: Update netdev.c --- components/net/netdev/src/netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/net/netdev/src/netdev.c') diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index 04bf6e8ad7..92d5b188eb 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -78,7 +78,7 @@ int netdev_register(struct netdev *netdev, const char *name, void *user_data) netdev->addr_callback = RT_NULL; /* fill network interface device */ - rt_strncpy(netdev->name, name, rt_strlen(name)); + rt_strncpy(netdev->name, name, RT_NAME_MAX); netdev->user_data = user_data; /* initialize current network interface device single list */ @@ -260,7 +260,7 @@ struct netdev *netdev_get_by_name(const char *name) for (node = &(netdev_list->list); node; node = rt_slist_next(node)) { netdev = rt_slist_entry(node, struct netdev, list); - if (netdev && (rt_strncmp(netdev->name, name, rt_strlen(netdev->name)) == 0)) + if (netdev && (rt_strncmp(netdev->name, name, RT_NAME_MAX) == 0)) { rt_hw_interrupt_enable(level); return netdev; -- cgit v1.3.1 From 14ac354dcaa1bc0fbc8e9484c6bf839931111bde Mon Sep 17 00:00:00 2001 From: xiangxistu Date: Thu, 31 Dec 2020 14:39:08 +0800 Subject: [update] when close auto check internet status, shield internet status information. Signed-off-by: xiangxistu --- components/net/netdev/src/netdev.c | 6 ++++-- components/net/sal_socket/src/sal_socket.c | 11 ----------- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'components/net/netdev/src/netdev.c') diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index 92d5b188eb..76a937cc75 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -901,8 +901,8 @@ static void netdev_list_if(void) { rt_kprintf("%d", netdev->hwaddr[index]); } - - + + } } @@ -911,8 +911,10 @@ static void netdev_list_if(void) else rt_kprintf(" DOWN"); if (netdev->flags & NETDEV_FLAG_LINK_UP) rt_kprintf(" LINK_UP"); else rt_kprintf(" LINK_DOWN"); +#ifdef SAL_INTERNET_CHECK if (netdev->flags & NETDEV_FLAG_INTERNET_UP) rt_kprintf(" INTERNET_UP"); else rt_kprintf(" INTERNET_DOWN"); +#endif if (netdev->flags & NETDEV_FLAG_DHCP) rt_kprintf(" DHCP_ENABLE"); else rt_kprintf(" DHCP_DISABLE"); if (netdev->flags & NETDEV_FLAG_ETHARP) rt_kprintf(" ETHARP"); diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index fa94184f68..27dea260fb 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -299,17 +299,6 @@ int sal_check_netdev_internet_up(struct netdev *netdev) rt_delayed_work_init(net_work, check_netdev_internet_up_work, (void *)netdev); rt_work_submit(&(net_work->work), RT_TICK_PER_SECOND); -#else - if(netdev_is_link_up(netdev)) - { - netdev->flags |= NETDEV_FLAG_INTERNET_UP; - } - else - { - netdev->flags &= ~NETDEV_FLAG_INTERNET_UP; - } - LOG_D("You have shut down internet check function, internet status is subject to link status."); - #endif /* SAL_INTERNET_CHECK */ return 0; } -- cgit v1.3.1 From 7a2ae46ecf67583ac663c81a2424d3abd61b741b Mon Sep 17 00:00:00 2001 From: xiangxistu Date: Thu, 25 Feb 2021 14:06:03 +0800 Subject: [fix] the wrong 'ifconfig' information for multi-network interface --- components/net/netdev/src/netdev.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'components/net/netdev/src/netdev.c') diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index 76a937cc75..d7bcf05654 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -45,6 +45,7 @@ struct netdev *netdev_default; int netdev_register(struct netdev *netdev, const char *name, void *user_data) { rt_base_t level; + uint8_t name_len; uint16_t flags_mask; int index; @@ -77,8 +78,21 @@ int netdev_register(struct netdev *netdev, const char *name, void *user_data) netdev->status_callback = RT_NULL; netdev->addr_callback = RT_NULL; + if(rt_strlen(name) > RT_NAME_MAX) + { + char netdev_name[RT_NAME_MAX + 1] = {0}; + + name_len = RT_NAME_MAX; + rt_strncpy(netdev_name, name, name_len); + LOG_E("netdev name[%s] length is so long that have been cut into [%s].", name, netdev_name); + } + else + { + name_len = rt_strlen(name); + } + /* fill network interface device */ - rt_strncpy(netdev->name, name, RT_NAME_MAX); + rt_strncpy(netdev->name, name, name_len); netdev->user_data = user_data; /* initialize current network interface device single list */ @@ -260,7 +274,7 @@ struct netdev *netdev_get_by_name(const char *name) for (node = &(netdev_list->list); node; node = rt_slist_next(node)) { netdev = rt_slist_entry(node, struct netdev, list); - if (netdev && (rt_strncmp(netdev->name, name, RT_NAME_MAX) == 0)) + if (netdev && (rt_strncmp(netdev->name, name, rt_strlen(netdev->name) < RT_NAME_MAX ? rt_strlen(netdev->name) : RT_NAME_MAX) == 0)) { rt_hw_interrupt_enable(level); return netdev; -- cgit v1.3.1 From e02f3764bd0799ccb13380a87019b475f45af12a Mon Sep 17 00:00:00 2001 From: xiangxistu Date: Thu, 25 Feb 2021 14:44:02 +0800 Subject: [delete] useless logic --- components/net/netdev/src/netdev.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'components/net/netdev/src/netdev.c') diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index d7bcf05654..cef11847f9 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -45,7 +45,6 @@ struct netdev *netdev_default; int netdev_register(struct netdev *netdev, const char *name, void *user_data) { rt_base_t level; - uint8_t name_len; uint16_t flags_mask; int index; @@ -82,17 +81,12 @@ int netdev_register(struct netdev *netdev, const char *name, void *user_data) { char netdev_name[RT_NAME_MAX + 1] = {0}; - name_len = RT_NAME_MAX; - rt_strncpy(netdev_name, name, name_len); + rt_strncpy(netdev_name, name, RT_NAME_MAX); LOG_E("netdev name[%s] length is so long that have been cut into [%s].", name, netdev_name); } - else - { - name_len = rt_strlen(name); - } /* fill network interface device */ - rt_strncpy(netdev->name, name, name_len); + rt_strncpy(netdev->name, name, RT_NAME_MAX); netdev->user_data = user_data; /* initialize current network interface device single list */ -- cgit v1.3.1