diff options
| author | Damien Zammit <damien@zamaudio.com> | 2022-09-22 00:42:17 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-09-22 02:48:39 +0200 |
| commit | b49d42d0613666b2835e7e5ca2d598b76d172876 (patch) | |
| tree | a9c0f0a7512b6b93ce4afe6d86b8bdde7c7ab5af /lwip | |
| parent | 58a4f46c7a3a223223a98a24f1b1dc7729c24521 (diff) | |
| download | hurd-b49d42d0613666b2835e7e5ca2d598b76d172876.tar.gz hurd-b49d42d0613666b2835e7e5ca2d598b76d172876.tar.bz2 hurd-b49d42d0613666b2835e7e5ca2d598b76d172876.zip | |
rioctl: Use r not i group ioctl for SIOCADDRT/SIOCDELRT
Message-Id: <20220922004105.961869-1-damien@zamaudio.com>
Diffstat (limited to 'lwip')
| -rw-r--r-- | lwip/Makefile | 3 | ||||
| -rw-r--r-- | lwip/iioctl-ops.c | 5 | ||||
| -rw-r--r-- | lwip/main.c | 2 | ||||
| -rw-r--r-- | lwip/mig-mutate.h | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/lwip/Makefile b/lwip/Makefile index d0ddfd38..a048dc7d 100644 --- a/lwip/Makefile +++ b/lwip/Makefile @@ -24,7 +24,7 @@ SRCS = main.c io-ops.c socket-ops.c pfinet-ops.c iioctl-ops.c port-objs.c \ startup-ops.c options.c lwip-util.c startup.c IFSRCS = ifcommon.c hurdethif.c hurdloopif.c hurdtunif.c MIGSRCS = ioServer.c socketServer.c pfinetServer.c iioctlServer.c \ - startup_notifyServer.c + startup_notifyServer.c rioctlServer.c OBJS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,\ $(SRCS) $(IFSRCS) $(MIGSRCS))) @@ -44,6 +44,7 @@ mig-sheader-prefix = lwip_ io-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h socket-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h iioctl-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h +rioctl-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h # cpp doesn't automatically make dependencies for -imacros dependencies. argh. lwip_io_S.h ioServer.c lwip_socket_S.h socketServer.c: mig-mutate.h diff --git a/lwip/iioctl-ops.c b/lwip/iioctl-ops.c index 4e285a49..14c4d585 100644 --- a/lwip/iioctl-ops.c +++ b/lwip/iioctl-ops.c @@ -21,6 +21,7 @@ /* Ioctls for network device configuration */ #include <lwip_iioctl_S.h> +#include <lwip_rioctl_S.h> #include <lwip/sockets.h> #include <lwip/inet.h> @@ -163,7 +164,7 @@ siocsifXaddr (struct sock_user *user, /* 10 SIOCADDRT -- Add a network route */ kern_return_t -lwip_S_iioctl_siocaddrt (struct sock_user *user, +lwip_S_rioctl_siocaddrt (struct sock_user *user, const ifname_t ifnam, const struct srtentry route) { @@ -172,7 +173,7 @@ lwip_S_iioctl_siocaddrt (struct sock_user *user, /* 11 SIOCDELRT -- Delete a network route */ kern_return_t -lwip_S_iioctl_siocdelrt (struct sock_user *user, +lwip_S_rioctl_siocdelrt (struct sock_user *user, const ifname_t ifnam, const struct srtentry route) { diff --git a/lwip/main.c b/lwip/main.c index 373f3935..0d7c9d6b 100644 --- a/lwip/main.c +++ b/lwip/main.c @@ -33,6 +33,7 @@ #include <lwip_socket_S.h> #include <lwip_pfinet_S.h> #include <lwip_iioctl_S.h> +#include <lwip_rioctl_S.h> #include <lwip_startup_notify_S.h> #include <netif/hurdethif.h> @@ -136,6 +137,7 @@ lwip_demuxer (mach_msg_header_t * inp, mach_msg_header_t * outp) if (routine || (routine = lwip_socket_server_routine (inp)) || (routine = lwip_pfinet_server_routine (inp)) || + (routine = lwip_rioctl_server_routine (inp)) || (routine = lwip_iioctl_server_routine (inp)) || (routine = lwip_startup_notify_server_routine (inp))) { diff --git a/lwip/mig-mutate.h b/lwip/mig-mutate.h index 3ed89c55..ecc9ce11 100644 --- a/lwip/mig-mutate.h +++ b/lwip/mig-mutate.h @@ -27,6 +27,7 @@ #define IO_DESTRUCTOR end_using_socket_port (sock_user_t) #define IO_IMPORTS import "mig-decls.h"; #define IIOCTL_IMPORTS import "mig-decls.h"; +#define RIOCTL_IMPORTS import "mig-decls.h"; #define SOCKET_INTRAN sock_user_t begin_using_socket_port (socket_t) #define SOCKET_INTRAN_PAYLOAD sock_user_t begin_using_socket_payload |