i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some minor cleanups.

Browse Source 
Eliminated a macro by introducing an inline function.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1351 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2002-10-03 04:45:07 +00:00
parent 225f93a081
commit 7e1d70ff27
1 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/core/if.c
+38 -14
View File
@@ -5,7 +5,7 @@
#include <string.h> #include <string.h>
#ifdef _KERNEL_ #ifdef _KERNEL_
#include <KernelExport.h> # include <KernelExport.h>
#endif #endif
#include "netinet/in.h" #include "netinet/in.h"
@@ -27,19 +27,32 @@ struct ifaddr **ifnet_addrs;
static int if_index; static int if_index;
static int if_indexlim; static int if_indexlim;
struct ifnet *get_interfaces(void)
static inline bool
equal(struct sockaddr *addr1, struct sockaddr *addr2)
{
return !memcmp(addr1, addr2, addr1->sa_len);
}
struct ifnet *
get_interfaces(void)
{ {
return devices; return devices;
} }
void if_init(void)
void
if_init(void)
{ {
ifnet_addrs = NULL; ifnet_addrs = NULL;
if_index = 0; if_index = 0;
if_indexlim = 8; /* initial value */ if_indexlim = 8; /* initial value */
} }
int ifioctl(struct socket *so, int cmd, caddr_t data)
int
ifioctl(struct socket *so, int cmd, caddr_t data)
{ {
struct ifnet *ifp; struct ifnet *ifp;
struct ifreq *ifr; struct ifreq *ifr;
@@ -85,7 +98,9 @@ int ifioctl(struct socket *so, int cmd, caddr_t data)
return 0; return 0;
} }
struct ifnet *ifunit(char *name)
struct ifnet *
ifunit(char *name)
{ {
ifnet *d = devices; ifnet *d = devices;
@@ -95,7 +110,9 @@ struct ifnet *ifunit(char *name)
return NULL; return NULL;
} }
void dump_sockaddr(void *ptr)
void
dump_sockaddr(void *ptr)
{ {
struct sockaddr *sa = (struct sockaddr *)ptr; struct sockaddr *sa = (struct sockaddr *)ptr;
uint8 *d = NULL; uint8 *d = NULL;
@@ -140,7 +157,9 @@ void dump_sockaddr(void *ptr)
} }
} }
void *protocol_address(struct ifnet *ifa, int family)
void *
protocol_address(struct ifnet *ifa, int family)
{ {
struct ifaddr *a = ifa->if_addrlist; struct ifaddr *a = ifa->if_addrlist;
@@ -156,15 +175,13 @@ void *protocol_address(struct ifnet *ifa, int family)
return NULL; return NULL;
} }
#define equal(a1, a2) \
(memcmp((caddr_t)(a1), (caddr_t)(a2), ((struct sockaddr *)(a1))->sa_len) == 0)
/* /*
* Find an interface address specific to an interface best matching * Find an interface address specific to an interface best matching
* a given address. * a given address.
*/ */
struct ifaddr *ifaof_ifpforaddr(struct sockaddr *addr, struct ifaddr *
struct ifnet *ifp) ifaof_ifpforaddr(struct sockaddr *addr, struct ifnet *ifp)
{ {
struct ifaddr *ifa; struct ifaddr *ifa;
char *cp, *cp2, *cp3; char *cp, *cp2, *cp3;
@@ -198,7 +215,9 @@ struct ifaddr *ifaof_ifpforaddr(struct sockaddr *addr,
return (ifa_maybe); return (ifa_maybe);
} }
struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *addr)
struct ifaddr *
ifa_ifwithdstaddr(struct sockaddr *addr)
{ {
struct ifnet *ifp; struct ifnet *ifp;
struct ifaddr *ifa; struct ifaddr *ifa;
@@ -215,7 +234,9 @@ struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *addr)
return (NULL); return (NULL);
} }
struct ifaddr *ifa_ifwithaddr(struct sockaddr *addr)
struct ifaddr *
ifa_ifwithaddr(struct sockaddr *addr)
{ {
struct ifnet *ifp; struct ifnet *ifp;
struct ifaddr *ifa; struct ifaddr *ifa;
@@ -236,11 +257,14 @@ struct ifaddr *ifa_ifwithaddr(struct sockaddr *addr)
return (NULL); return (NULL);
} }
/* /*
* Find an interface on a specific network. If many, choice * Find an interface on a specific network. If many, choice
* is most specific found. * is most specific found.
*/ */
struct ifaddr *ifa_ifwithnet(struct sockaddr *addr)
struct ifaddr *
ifa_ifwithnet(struct sockaddr *addr)
{ {
struct ifnet *ifp; struct ifnet *ifp;
struct ifaddr *ifa; struct ifaddr *ifa;