Skip to content

Commit 31190a7

Browse files
authored
Merge pull request #34 from JerryMain/task-09-patch
task-09: Fixes errors related to gnrc_netreg_entry
2 parents de830fe + 72c3cea commit 31190a7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: task-09/udp.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "timex.h"
2929
#include "xtimer.h"
3030

31-
static gnrc_netreg_entry_t server = { NULL, GNRC_NETREG_DEMUX_CTX_ALL, KERNEL_PID_UNDEF };
31+
static gnrc_netreg_entry_t server = GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX_CTX_ALL, KERNEL_PID_UNDEF);
3232

3333

3434
static void send(char *addr_str, char *port_str, char *data, unsigned int num,
@@ -93,7 +93,7 @@ static void start_server(char *port_str)
9393
uint16_t port;
9494

9595
/* check if server is already running */
96-
if (server.pid != KERNEL_PID_UNDEF) {
96+
if (server.target.pid != KERNEL_PID_UNDEF) {
9797
printf("Error: server already running on port %" PRIu32 "\n",
9898
server.demux_ctx);
9999
return;
@@ -105,7 +105,7 @@ static void start_server(char *port_str)
105105
return;
106106
}
107107
/* start server (which means registering pktdump for the chosen port) */
108-
server.pid = gnrc_pktdump_pid;
108+
server.target.pid = gnrc_pktdump_pid;
109109
server.demux_ctx = (uint32_t)port;
110110
gnrc_netreg_register(GNRC_NETTYPE_UDP, &server);
111111
printf("Success: started UDP server on port %" PRIu16 "\n", port);
@@ -114,13 +114,13 @@ static void start_server(char *port_str)
114114
static void stop_server(void)
115115
{
116116
/* check if server is running at all */
117-
if (server.pid == KERNEL_PID_UNDEF) {
117+
if (server.target.pid == KERNEL_PID_UNDEF) {
118118
printf("Error: server was not running\n");
119119
return;
120120
}
121121
/* stop server */
122122
gnrc_netreg_unregister(GNRC_NETTYPE_UDP, &server);
123-
server.pid = KERNEL_PID_UNDEF;
123+
server.target.pid = KERNEL_PID_UNDEF;
124124
puts("Success: stopped UDP server");
125125
}
126126

0 commit comments

Comments
 (0)