fd8e4ebc8c
deprecated in favor of the POSIX-defined lowercase variants. o Change all occurrences of NTOHL() and associated marcros in the source tree to use the lowercase function variants. o Add missing license bits to sparc64's <machine/endian.h>. Approved by: jake o Clean up <machine/endian.h> files. o Remove unused __uint16_swap_uint32() from i386's <machine/endian.h>. o Remove prototypes for non-existent bswapXX() functions. o Include <machine/endian.h> in <arpa/inet.h> to define the POSIX-required ntohl() family of functions. o Do similar things to expose the ntohl() family in libstand, <netinet/in.h>, and <sys/param.h>. o Prepend underscores to the ntohl() family to help deal with complexities associated with having MD (asm and inline) versions, and having to prevent exposure of these functions in other headers that happen to make use of endian-specific defines. o Create weak aliases to the canonical function name to help deal with third-party software forgetting to include an appropriate header. o Remove some now unneeded pollution from <sys/types.h>. o Add missing <arpa/inet.h> includes in userland. Tested on: alpha, i386 Reviewed by: bde, jake, tmm
103 lines
3.2 KiB
C
103 lines
3.2 KiB
C
/*
|
|
* Copyright (c) 1986, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)ipx_ntoa.c";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/param.h>
|
|
#include <arpa/inet.h>
|
|
#include <netipx/ipx.h>
|
|
#include <stdio.h>
|
|
|
|
char *
|
|
ipx_ntoa(addr)
|
|
struct ipx_addr addr;
|
|
{
|
|
static char obuf[40];
|
|
union { union ipx_net net_e; u_long long_e; } net;
|
|
u_short port = htons(addr.x_port);
|
|
register char *cp;
|
|
char *cp2;
|
|
register u_char *up = addr.x_host.c_host;
|
|
u_char *uplim = up + 6;
|
|
static char *spectHex();
|
|
|
|
net.net_e = addr.x_net;
|
|
sprintf(obuf, "%lx", (u_long)ntohl(net.long_e));
|
|
cp = spectHex(obuf);
|
|
cp2 = cp + 1;
|
|
while (*up==0 && up < uplim) up++;
|
|
if (up == uplim) {
|
|
if (port) {
|
|
sprintf(cp, ".0");
|
|
cp += 2;
|
|
}
|
|
} else {
|
|
sprintf(cp, ".%x", *up++);
|
|
while (up < uplim) {
|
|
while (*cp) cp++;
|
|
sprintf(cp, "%02x", *up++);
|
|
}
|
|
cp = spectHex(cp2);
|
|
}
|
|
if (port) {
|
|
sprintf(cp, ".%x", port);
|
|
spectHex(cp + 1);
|
|
}
|
|
return (obuf);
|
|
}
|
|
|
|
static char *
|
|
spectHex(p0)
|
|
char *p0;
|
|
{
|
|
int ok = 0;
|
|
int nonzero = 0;
|
|
register char *p = p0;
|
|
for (; *p; p++) switch (*p) {
|
|
|
|
case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
|
|
case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
|
|
ok = 1;
|
|
case '1': case '2': case '3': case '4': case '5':
|
|
case '6': case '7': case '8': case '9':
|
|
nonzero = 1;
|
|
}
|
|
if (nonzero && !ok) { *p++ = 'H'; *p = 0; }
|
|
return (p);
|
|
}
|