From 791fe8ec0f6f45242a7ddee4bf77dc3149dc143e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 29 Jul 2010 09:54:46 +0000 Subject: [PATCH] * Added new socket ioctls to strace, and the datalink debug output. * Added a few more types to strace's network ioctls. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37807 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/network/stack/datalink.cpp | 4 ++++ src/bin/debug/strace/ioctl.cpp | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/network/stack/datalink.cpp b/src/add-ons/kernel/network/stack/datalink.cpp index c5b193460a..8e7c2b2b3e 100644 --- a/src/add-ons/kernel/network/stack/datalink.cpp +++ b/src/add-ons/kernel/network/stack/datalink.cpp @@ -111,6 +111,10 @@ option_to_string(int32 option) CODE(SIOCSIFGENERIC) /* generic IF set op */ CODE(SIOCGIFGENERIC) /* generic IF get op */ + CODE(SIOC_IF_ALIAS_SET) /* set interface alias, ifaliasreq */ + CODE(SIOC_IF_ALIAS_GET) /* get interface alias, ifaliasreq */ + CODE(SIOC_IF_ALIAS_COUNT) /* count interface aliases */ + default: static char buffer[24]; snprintf(buffer, sizeof(buffer), "%" B_PRId32, option); diff --git a/src/bin/debug/strace/ioctl.cpp b/src/bin/debug/strace/ioctl.cpp index e463c0af70..ae7b91825c 100644 --- a/src/bin/debug/strace/ioctl.cpp +++ b/src/bin/debug/strace/ioctl.cpp @@ -77,12 +77,12 @@ static const ioctl_info kIOCtls[] = { IOCTL_INFO_ENTRY_TYPE(SIOCGIFFLAGS, struct ifreq *), IOCTL_INFO_ENTRY_TYPE(SIOCGIFBRDADDR, struct ifreq *), IOCTL_INFO_ENTRY_TYPE(SIOCSIFBRDADDR, struct ifreq *), - IOCTL_INFO_ENTRY(SIOCGIFCOUNT), + IOCTL_INFO_ENTRY_TYPE(SIOCGIFCOUNT, struct ifconf *), IOCTL_INFO_ENTRY_TYPE(SIOCGIFCONF, struct ifconf *), IOCTL_INFO_ENTRY_TYPE(SIOCGIFINDEX, struct ifreq *), IOCTL_INFO_ENTRY(SIOCGIFNAME), - IOCTL_INFO_ENTRY(SIOCGIFNETMASK), - IOCTL_INFO_ENTRY(SIOCSIFNETMASK), + IOCTL_INFO_ENTRY_TYPE(SIOCGIFNETMASK, struct ifreq *), + IOCTL_INFO_ENTRY_TYPE(SIOCSIFNETMASK, struct ifreq *), IOCTL_INFO_ENTRY_TYPE(SIOCGIFMETRIC, struct ifreq *), IOCTL_INFO_ENTRY_TYPE(SIOCSIFMETRIC, struct ifreq *), IOCTL_INFO_ENTRY_TYPE(SIOCDIFADDR, struct ifreq *), @@ -96,7 +96,7 @@ static const ioctl_info kIOCtls[] = { IOCTL_INFO_ENTRY(SIOCGRTSIZE), IOCTL_INFO_ENTRY(SIOCGRTTABLE), IOCTL_INFO_ENTRY_TYPE(SIOCGIFSTATS, struct ifreq *), - IOCTL_INFO_ENTRY(SIOCGIFTYPE), + IOCTL_INFO_ENTRY_TYPE(SIOCGIFTYPE, struct ifreq *), IOCTL_INFO_ENTRY(SIOCSPACKETCAP), IOCTL_INFO_ENTRY(SIOCCPACKETCAP), IOCTL_INFO_ENTRY(SIOCSHIWAT), @@ -106,6 +106,10 @@ static const ioctl_info kIOCtls[] = { IOCTL_INFO_ENTRY(SIOCATMARK), IOCTL_INFO_ENTRY(SIOCSPGRP), + IOCTL_INFO_ENTRY_TYPE(SIOC_IF_ALIAS_SET, struct ifaliasreq *), + IOCTL_INFO_ENTRY_TYPE(SIOC_IF_ALIAS_GET, struct ifaliasreq *), + IOCTL_INFO_ENTRY_TYPE(SIOC_IF_ALIAS_COUNT, struct ifaliasreq *), + // termios ioctls IOCTL_INFO_ENTRY(TCGETA), IOCTL_INFO_ENTRY(TCSETA),