diff options
author | deraadt <> | 1999-07-03 21:43:12 +0000 |
---|---|---|
committer | deraadt <> | 1999-07-03 21:43:12 +0000 |
commit | 11b6f12bb197a5b34ad2a1da38937da31e9410ac (patch) | |
tree | 38902a8891431cdf52082e0584382969f9cb74d4 | |
parent | fa1ff4d7c9e3e11ade89bbcf0fdb6d4a24cc8eae (diff) | |
download | openbsd-11b6f12bb197a5b34ad2a1da38937da31e9410ac.tar.gz openbsd-11b6f12bb197a5b34ad2a1da38937da31e9410ac.tar.bz2 openbsd-11b6f12bb197a5b34ad2a1da38937da31e9410ac.zip |
if_freenameindex() API
-rw-r--r-- | src/lib/libc/net/Makefile.inc | 17 | ||||
-rw-r--r-- | src/lib/libc/net/if_indextoname.3 | 13 |
2 files changed, 19 insertions, 11 deletions
diff --git a/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc index 7b44515aa9..22270bc24e 100644 --- a/src/lib/libc/net/Makefile.inc +++ b/src/lib/libc/net/Makefile.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.23 1999/07/03 20:26:55 deraadt Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.24 1999/07/03 21:43:12 deraadt Exp $ |
2 | 2 | ||
3 | # net sources | 3 | # net sources |
4 | .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net | 4 | .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net |
@@ -25,15 +25,11 @@ SRCS+= base64.c freeaddrinfo.c gai_strerror.c getaddrinfo.c gethostnamadr.c \ | |||
25 | 25 | ||
26 | .include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net/Makefile.inc" | 26 | .include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net/Makefile.inc" |
27 | 27 | ||
28 | MAN+= byteorder.3 ethers.3 gethostbyname.3 getnetent.3 getprotoent.3 \ | 28 | MAN+= byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 getnameinfo.3 \ |
29 | getservent.3 inet.3 inet_net.3 iso_addr.3 link_addr.3 ns.3 ipx.3 \ | 29 | getnetent.3 getprotoent.3 getservent.3 inet.3 if_indextoname.3 \ |
30 | rcmd.3 rcmdsh.3 resolver.3 net_addrcmp.3 \ | 30 | inet_net.3 iso_addr.3 link_addr.3 ns.3 ipx.3 \ |
31 | getnameinfo.3 getaddrinfo.3 if_indextoname.3 | 31 | rcmd.3 rcmdsh.3 resolver.3 net_addrcmp.3 |
32 | 32 | ||
33 | MLINKS+= getaddrinfo.3 freeaddrinfo.3 | ||
34 | MLINKS+= getaddrinfo.3 gai_strerror.3 | ||
35 | MLINKS+= if_indextoname.3 if_nametoindex.3 | ||
36 | MLINKS+= if_indextoname.3 if_nameindex.3 | ||
37 | 33 | ||
38 | MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ | 34 | MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ |
39 | byteorder.3 ntohs.3 byteorder.3 htobe16.3 byteorder.3 htobe32.3 \ | 35 | byteorder.3 ntohs.3 byteorder.3 htobe16.3 byteorder.3 htobe32.3 \ |
@@ -42,6 +38,7 @@ MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ | |||
42 | byteorder.3 swap16.3 byteorder.3 swap32.3 | 38 | byteorder.3 swap16.3 byteorder.3 swap32.3 |
43 | MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \ | 39 | MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \ |
44 | ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3 ethers.3 ether_addr.3 | 40 | ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3 ethers.3 ether_addr.3 |
41 | MLINKS+= getaddrinfo.3 freeaddrinfo.3 getaddrinfo.3 gai_strerror.3 | ||
45 | MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \ | 42 | MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \ |
46 | gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \ | 43 | gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \ |
47 | gethostbyname.3 herror.3 gethostbyname.3 gethostbyname2.3 \ | 44 | gethostbyname.3 herror.3 gethostbyname.3 gethostbyname2.3 \ |
@@ -52,6 +49,8 @@ MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \ | |||
52 | getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3 | 49 | getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3 |
53 | MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \ | 50 | MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \ |
54 | getservent.3 getservbyport.3 getservent.3 setservent.3 | 51 | getservent.3 getservbyport.3 getservent.3 setservent.3 |
52 | MLINKS+= if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \ | ||
53 | if_indextoname.3 if_freenameindex.3 | ||
55 | MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \ | 54 | MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \ |
56 | inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \ | 55 | inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \ |
57 | inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 network.3 \ | 56 | inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 network.3 \ |
diff --git a/src/lib/libc/net/if_indextoname.3 b/src/lib/libc/net/if_indextoname.3 index c8bb212536..eb33c94254 100644 --- a/src/lib/libc/net/if_indextoname.3 +++ b/src/lib/libc/net/if_indextoname.3 | |||
@@ -30,7 +30,7 @@ | |||
30 | .\" SUCH DAMAGE. | 30 | .\" SUCH DAMAGE. |
31 | .\" | 31 | .\" |
32 | .\" From: @(#)rcmd.3 8.1 (Berkeley) 6/4/93 | 32 | .\" From: @(#)rcmd.3 8.1 (Berkeley) 6/4/93 |
33 | .\" $Id: if_indextoname.3,v 1.1 1999/07/03 20:22:21 deraadt Exp $ | 33 | .\" $Id: if_indextoname.3,v 1.2 1999/07/03 21:43:12 deraadt Exp $ |
34 | .\" | 34 | .\" |
35 | .Dd May 21, 1998 | 35 | .Dd May 21, 1998 |
36 | .Dt IF_NAMETOINDEX 3 | 36 | .Dt IF_NAMETOINDEX 3 |
@@ -39,6 +39,7 @@ | |||
39 | .Nm if_nametoindex , | 39 | .Nm if_nametoindex , |
40 | .Nm if_indextoname , | 40 | .Nm if_indextoname , |
41 | .Nm if_nameindex , | 41 | .Nm if_nameindex , |
42 | .Nm if_freenameindex | ||
42 | .Nd convert interface index to name, and vice versa | 43 | .Nd convert interface index to name, and vice versa |
43 | .Sh SYNOPSIS | 44 | .Sh SYNOPSIS |
44 | .Fd #include <net/if.h> | 45 | .Fd #include <net/if.h> |
@@ -49,6 +50,7 @@ | |||
49 | .Ft "struct if_nameindex *" | 50 | .Ft "struct if_nameindex *" |
50 | .Fn if_nameindex "void" | 51 | .Fn if_nameindex "void" |
51 | .Ft "void" | 52 | .Ft "void" |
53 | .Fn if_freenameindex "struct if_nameindex *ptr" | ||
52 | .Sh DESCRIPTION | 54 | .Sh DESCRIPTION |
53 | The functions map interface index to readable interface name | 55 | The functions map interface index to readable interface name |
54 | .Po | 56 | .Po |
@@ -112,8 +114,15 @@ names pointed to by the | |||
112 | .Fa if_name | 114 | .Fa if_name |
113 | members is obtained dynamically. | 115 | members is obtained dynamically. |
114 | This memory is freed by the | 116 | This memory is freed by the |
115 | .Xr free 3 | 117 | .Fn if_freenameindex |
116 | function. | 118 | function. |
119 | .Pp | ||
120 | .Fn if_freenameindex | ||
121 | takes a pointer that was returned by | ||
122 | .Fn if_nameindex | ||
123 | as argument | ||
124 | .Pq Fa ptr , | ||
125 | and it reclaims the region allocated. | ||
117 | .Sh DIAGNOSTICS | 126 | .Sh DIAGNOSTICS |
118 | .Fn if_nametoindex | 127 | .Fn if_nametoindex |
119 | returns 0 on error, positive integer on success. | 128 | returns 0 on error, positive integer on success. |