net: add a generic udp protocol
Subsystems (2)
PATCH v4 1/3 net: add a generic udp protocol
This commit adds a generic udp protocol framework in the network loop. So protocol based on udp may be implemented without modifying the network loop (for example custom wait magic packet).
---
Changelog:
v4:
- no change
v3:
- add file doc/README.udp
- add more comments on function udp_loop
- fix sentence in Kconfig
- use if (IS_ENABLE(...)) when it is possible
- avoid checking null pointer twice
v2:
- no change
doc/README.udp | 35 +++++++++++++++++++++++++++++++++++ include/net.h | 2 +- include/net/udp.h | 41 +++++++++++++++++++++++++++++++++++++++++ net/Kconfig | 6 ++++++ net/Makefile | 1 + net/net.c | 13 ++++++++++++- net/udp.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 doc/README.udp create mode 100644 include/net/udp.h create mode 100644 net/udp.c
doc/README.udp new file +35 -0
@@ -0,0 +1,35 @@ +Udp framework + +The udp framework is build on top of network framework and is designed +to define new protocol or new command based on udp without modifying +the network framework. + +The udp framework define a function udp_loop that take as argument +a structure udp_ops (defined in include/net/udp.h) : + +struct udp_ops { + int (*prereq)(void *data); + int (*start)(void *data); + void *data; +}; + +The callback prereq define if all the requirements are +valid before running the network/udp loop. + +The callback start define the first step in the network/udp loop, +and it may also be used to configure a timemout and udp handler. + +The pointer data is used to store private data that +could be used by both callback. + +A simple example to use this framework: + +static struct udp_ops udp_ops = { + .prereq = wmp_prereq, + .start = wmp_start, + .data = NULL, +}; + +... + +err = udp_loop(&udp_ops);
include/net.h +1 -1
@@ -551,7 +551,7 @@ extern int net_restart_wrap; /* Tried all network devices */enum proto_t {BOOTP ,RARP ,ARP ,TFTPGET ,DHCP ,PING ,DNS ,NFS ,CDP ,NETCONS ,SNTP , -TFTPSRV ,TFTPPUT ,LINKLOCAL ,FASTBOOT ,WOL +TFTPSRV ,TFTPPUT ,LINKLOCAL ,FASTBOOT ,WOL ,UDP };extern char net_boot_file_name[1024 ];/* Boot File name */
include/net/udp.h new file +41 -0
41 lines not on this page · raw message
net/Kconfig +6 -0
@@ -8,6 +8,12 @@ menuconfig NET if NET +config PROT_UDP + bool "Enable generic udp framework" + help + Enable a generic udp framework that allows defining a custom + handler for udp protocol. + config BOOTP_SEND_HOSTNAME bool "Send hostname to DNS server" help
net/Makefile +1 -0
@@ -27,6 +27,7 @@ obj-$(CONFIG_CMD_SNTP) += sntp.o obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o obj-$(CONFIG_UDP_FUNCTION_FASTBOOT) += fastboot.o obj-$(CONFIG_CMD_WOL) += wol.o +obj-$(CONFIG_PROT_UDP) += udp.o # Disable this warning as it is triggered by: # sprintf(buf, index ? "foo%d" : "foo", index)
net/net.c +12 -1
@@ -102,6 +102,7 @@#if defined(CONFIG_CMD_PCAP )#include <net/pcap.h> #endif +#include <net/udp.h> #if defined(CONFIG_LED_STATUS )#include <miiphy.h> #include <status_led.h>
@@ -544,6 +545,9 @@ restart:break ; } +if (IS_ENABLED (CONFIG_PROT_UDP ) && protocol ==UDP ) +udp_start (); +break ; }
@@ -1364,6 +1368,13 @@ static int net_check_prereq(enum proto_t protocol) } goto common;#endif +#if defined(CONFIG_PROT_UDP ) +case UDP : +if (udp_prereq ()) +return 1 ; + goto common; +#endif +#if defined(CONFIG_CMD_NFS )case NFS :#endif
@@ -1375,7 +1386,7 @@ static int net_check_prereq(enum proto_t protocol)return 1 ; }#if defined(CONFIG_CMD_PING ) || defined(CONFIG_CMD_SNTP ) || \ - defined(CONFIG_CMD_DNS ) + defined(CONFIG_CMD_DNS ) || defined(CONFIG_PROT_UDP ) common:#endif /* Fall through */
net/udp.c new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 2/3 sandbox: enable support of generic udp protocol
This commit enable the support of the generic udp protocol.
---
Changelog:
v4:
- no change
v3:
- no change
v2:
- new patch in the serie
configs/sandbox_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/sandbox_defconfig +1 -0
@@ -102,6 +102,7 @@ CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_EXT4=y CONFIG_ENV_EXT4_INTERFACE="host" CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0" +CONFIG_PROT_UDP=y CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_NETCONSOLE=y CONFIG_IP_DEFRAG=y
Signature · 1 line
2.7.4
PATCH v4 2/3 sandbox: enable support of generic udp protocol
Quoted 4 lines · Philippe Reynes
This commit enable the support of the generic udp protocol.
Signed-off-by Philippe Reynes <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201001/9615ad89/attachment.sig>
PATCH v4 3/3 sntp: use udp framework
In reply to Philippe ReynesThis commits update the support of sntp to use the framework udp. This change allows to remove all the reference to sntp in the main network file net/net.c.
---
Changelog:
v4:
- new patch in the serie
cmd/Kconfig | 1 + cmd/net.c | 10 +++++++++- include/net/sntp.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ net/net.c | 31 +---------------------------- net/sntp.c | 29 +++++++++++++++++++++++++-- net/sntp.h | 57 ----------------------------------------------------- 6 files changed, 96 insertions(+), 90 deletions(-) create mode 100644 include/net/sntp.h delete mode 100644 net/sntp.h
cmd/Kconfig +1 -0
@@ -1633,6 +1633,7 @@ config CMD_CDP config CMD_SNTP bool "sntp" + select PROT_UDP help Synchronize RTC via network
cmd/net.c +9 -1
@@ -13,6 +13,8 @@#include <env.h> #include <image.h> #include <net.h> +#include <net/udp.h> +#include <net/sntp.h> static int netboot_common (enum proto_t ,struct cmd_tbl *,int ,char *const []);
@@ -356,6 +358,12 @@ U_BOOT_CMD(#endif #if defined(CONFIG_CMD_SNTP ) +static struct udp_ops sntp_ops = { + .prereq = sntp_prereq, + .start = sntp_start, + .data =NULL , +}; +int do_sntp (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {char *toff;
@@ -380,7 +388,7 @@ int do_sntp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])else net_ntp_time_offset =simple_strtol (toff,NULL ,10 ); -if (net_loop (SNTP ) <0 ) { +if (udp_loop (&sntp_ops) <0 ) {printf ("SNTP failed: host %pI4 not responding\n" , &net_ntp_server);return CMD_RET_FAILURE ;
include/net/sntp.h new file +58 -0
58 lines not on this page · raw message
net/net.c +1 -30
@@ -72,12 +72,6 @@* We want: - load the boot file * Next step: none * -* SNTP: -* -* Prerequisites: - own ethernet address -* - own IP address -* We want: - network time -* Next step: none * * WOL: *
@@ -119,9 +113,6 @@#include "nfs.h" #include "ping.h" #include "rarp.h" -#if defined(CONFIG_CMD_SNTP ) -#include "sntp.h" -#endif #if defined(CONFIG_CMD_WOL )#include "wol.h" #endif
@@ -185,13 +176,6 @@ u32 net_boot_file_size;/* Boot file size in blocks as reported by the DHCP server */ u32 net_boot_file_expected_size_in_blocks; -#if defined(CONFIG_CMD_SNTP ) -/* NTP server IP address */ -struct in_addr net_ntp_server; -/* offset time from UTC */ -int net_ntp_time_offset; -#endif -static uchar net_pkt_buf[(PKTBUFSRX +1 ) *PKTSIZE_ALIGN +PKTALIGN ];/* Receive packets */ uchar *net_rx_packets[PKTBUFSRX ];
@@ -521,11 +505,6 @@ restart:nc_start ();break ;#endif -#if defined(CONFIG_CMD_SNTP ) -case SNTP : -sntp_start (); -break ; -#endif #if defined(CONFIG_CMD_DNS )case DNS :dns_start ();
@@ -1352,14 +1331,6 @@ static int net_check_prereq(enum proto_t protocol) } goto common;#endif -#if defined(CONFIG_CMD_SNTP ) -case SNTP : -if (net_ntp_server.s_addr ==0 ) { -puts ("*** ERROR: NTP server address not given\n" ); -return 1 ; - } - goto common; -#endif #if defined(CONFIG_CMD_DNS )case DNS :if (net_dns_server.s_addr ==0 ) {
@@ -1385,7 +1356,7 @@ static int net_check_prereq(enum proto_t protocol)puts ("*** ERROR: `serverip' not set\n" );return 1 ; } -#if defined(CONFIG_CMD_PING ) || defined(CONFIG_CMD_SNTP ) || \ +#if defined(CONFIG_CMD_PING ) || \ defined(CONFIG_CMD_DNS ) || defined(CONFIG_PROT_UDP ) common:#endif
net/sntp.c +27 -2
@@ -12,12 +12,17 @@#include <net.h> #include <rtc.h> -#include "sntp.h" +#include <net/sntp.h> #define SNTP_TIMEOUT 10000ULstatic int sntp_our_port; +/* NTP server IP address */ +struct in_addr net_ntp_server; +/* offset time from UTC */ +int net_ntp_time_offset; +static void sntp_send (void ) {struct sntp_pkt_t pkt;
@@ -93,7 +98,25 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,net_set_state (NETLOOP_SUCCESS ); } -void sntp_start (void ) +/* +* SNTP: +* +* Prerequisites: - own ethernet address +* - own IP address +* We want: - network time +* Next step: none +*/ +int sntp_prereq (void *data) +{ +if (net_ntp_server.s_addr ==0 ) { +puts ("*** ERROR: NTP server address not given\n" ); +return 1 ; + } + +return 0 ; +} + +int sntp_start (void *data) {debug ("%s\n" , __func__);
@@ -102,4 +125,6 @@ void sntp_start(void)memset (net_server_ethaddr,0 ,sizeof (net_server_ethaddr));sntp_send (); + +return 0 ; }
net/sntp.h deleted +0 -57
57 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 3/3 sntp: use udp framework
Hi Philippe,
Quoted 13 lines · Philippe Reynes
This commits update the support of sntp to use
the framework udp. This change allows to remove
all the reference to sntp in the main network
filenet/net.c.Signed-off-by Philippe Reynes <[email protected]>---
Changelog:
v4:
- new patch in the serie
Quoted 10 lines
cmd/Kconfig | 1 + cmd/net.c | 10 +++++++++- include/net/sntp.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ net/net.c | 31 +---------------------------- net/sntp.c | 29 +++++++++++++++++++++++++-- net/sntp.h | 57 ----------------------------------------------------- 6 files changed, 96 insertions(+), 90 deletions(-) create mode 100644 include/net/sntp.h delete mode 100644 net/sntp.h
I wonder if we should use driver model to have a network-protocol uclass?
Regards,
Simon
PATCH v4 3/3 sntp: use udp framework
In reply to Philippe ReynesQuoted 7 lines · Philippe Reynes
This commits update the support of sntp to use
the framework udp. This change allows to remove
all the reference to sntp in the main network
filenet/net.c.Signed-off-by Philippe Reynes <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201001/63c1560f/attachment.sig>
PATCH v4 1/3 net: add a generic udp protocol
In reply to Philippe ReynesQuoted 7 lines · Philippe Reynes
This commit adds a generic udp protocol framework in the network loop. So protocol based on udp may be implemented without modifying the network loop (for example custom wait magic packet).
Signed-off-by Philippe Reynes <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201001/966351f3/attachment.sig>