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 /pfinet | |
| 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 'pfinet')
| -rw-r--r-- | pfinet/Makefile | 3 | ||||
| -rw-r--r-- | pfinet/iioctl-ops.c | 4 | ||||
| -rw-r--r-- | pfinet/main.c | 3 | ||||
| -rw-r--r-- | pfinet/mig-mutate.h | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/pfinet/Makefile b/pfinet/Makefile index 74cedcf6..a210a113 100644 --- a/pfinet/Makefile +++ b/pfinet/Makefile @@ -87,7 +87,7 @@ SRCS = sched.c timer-emul.c socket.c main.c ethernet.c \ kmem_cache.c stubs.c dummy.c tunnel.c pfinet-ops.c \ iioctl-ops.c MIGSRCS = ioServer.c socketServer.c startup_notifyServer.c \ - pfinetServer.c iioctlServer.c + pfinetServer.c iioctlServer.c rioctlServer.c OBJS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,\ $(LINUXSRCS) $(ARCHSRCS) $(SRCS) $(MIGSRCS))) LINUXHDRS = bitops.h capability.h delay.h errqueue.h etherdevice.h \ @@ -142,6 +142,7 @@ asm/checksum.h: ../config.status 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. io_S.h ioServer.c socket_S.h socketServer.c: mig-mutate.h diff --git a/pfinet/iioctl-ops.c b/pfinet/iioctl-ops.c index adf7bd82..7673f3a6 100644 --- a/pfinet/iioctl-ops.c +++ b/pfinet/iioctl-ops.c @@ -363,7 +363,7 @@ siocsifXaddr (struct sock_user *user, /* 10 SIOCADDRT -- Add a network route */ kern_return_t -S_iioctl_siocaddrt (struct sock_user *user, +S_rioctl_siocaddrt (struct sock_user *user, const ifname_t ifnam, const struct srtentry route) { @@ -388,7 +388,7 @@ S_iioctl_siocaddrt (struct sock_user *user, /* 11 SIOCDELRT -- Delete a network route */ kern_return_t -S_iioctl_siocdelrt (struct sock_user *user, +S_rioctl_siocdelrt (struct sock_user *user, const ifname_t ifnam, const struct srtentry route) { diff --git a/pfinet/main.c b/pfinet/main.c index cb01e0bf..1df987f0 100644 --- a/pfinet/main.c +++ b/pfinet/main.c @@ -84,6 +84,7 @@ extern struct argp pfinet_argp; #include "socket_S.h" #include "pfinet_S.h" #include "iioctl_S.h" +#include "rioctl_S.h" #include "startup_notify_S.h" int @@ -112,6 +113,7 @@ pfinet_demuxer (mach_msg_header_t *inp, if ((routine = io_server_routine (inp)) || (routine = socket_server_routine (inp)) || (routine = pfinet_server_routine (inp)) || + (routine = rioctl_server_routine (inp)) || (routine = iioctl_server_routine (inp)) || (routine = NULL, trivfs_demuxer (inp, outp)) || (routine = startup_notify_server_routine (inp))) @@ -128,6 +130,7 @@ pfinet_demuxer (mach_msg_header_t *inp, mig_routine_t routine; if ((routine = socket_server_routine (inp)) || (routine = pfinet_server_routine (inp)) || + (routine = rioctl_server_routine (inp)) || (routine = iioctl_server_routine (inp)) || (routine = NULL, trivfs_demuxer (inp, outp)) || (routine = startup_notify_server_routine (inp))) diff --git a/pfinet/mig-mutate.h b/pfinet/mig-mutate.h index 2bc385b8..d470152f 100644 --- a/pfinet/mig-mutate.h +++ b/pfinet/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 |