Tue Dec 2 19:33:44 2014 UTC ()

- s/u_intX/uintX/
- add routines to print sockaddr_at and ataddr.


(christos)

diff -r1.7 -r1.8 src/sys/netatalk/at.h
diff -r0 -r1.1 src/sys/netatalk/at_print.c
diff -r1.1 -r1.2 src/sys/netatalk/files.netatalk

--- src/sys/netatalk/at.h 2005/12/10 23:29:05	1.7
+++ src/sys/netatalk/at.h 2014/12/02 19:33:44	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: at.h,v 1.7 2005/12/10 23:29:05 elad Exp $	*/
+/*	$NetBSD: at.h,v 1.8 2014/12/02 19:33:44 christos Exp $	*/
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this software and
  * its documentation for any purpose and without fee is hereby granted,
  * provided that the above copyright notice appears in all copies and
  * that both that copyright notice and this permission notice appear
  * in supporting documentation, and that the name of The University
  * of Michigan not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior
  * permission. This software is supplied as is without expressed or
 @@ -49,57 +49,65 @@ typedef __sa_family_t	sa_family_t;
  * Port was created by a privileged process.
  * If ATPORT_RESERVED <= Port < ATPORT_LAST,
  * Port was not necessarily created by a
  * privileged process.
  */
 #define ATPORT_FIRST	1
 #define ATPORT_RESERVED	128
 #define ATPORT_LAST	255
 /*
  * AppleTalk address.
  */
 struct at_addr {
-	u_int16_t         s_net;
+	uint16_t         s_net;
-	u_int8_t          s_node;
+	uint8_t          s_node;
 };
-#define ATADDR_ANYNET	(u_int16_t)0x0000
+#define ATADDR_ANYNET	(uint16_t)0x0000
-#define ATADDR_ANYNODE	(u_int8_t)0x00
+#define ATADDR_ANYNODE	(uint8_t)0x00
-#define ATADDR_ANYPORT	(u_int8_t)0x00
+#define ATADDR_ANYPORT	(uint8_t)0x00
-#define ATADDR_BCAST	(u_int8_t)0xff	/* There is no BCAST for NET */
+#define ATADDR_BCAST	(uint8_t)0xff	/* There is no BCAST for NET */
 struct netrange {
-	u_int8_t	nr_phase;
+	uint8_t		nr_phase;
-	u_int16_t	nr_firstnet;
+	uint16_t	nr_firstnet;
-	u_int16_t	nr_lastnet;
+	uint16_t	nr_lastnet;
 };
 /*
  * Socket address, AppleTalk style.  We keep magic information in the
  * zero bytes.  There are three types, NONE, CONFIG which has the phase
  * and a net range, and IFACE which has the network address of an
  * interface.  IFACE may be filled in by the client, and is filled in
  * by the kernel.
  */
 struct sockaddr_at {
-	u_int8_t	sat_len;
+	uint8_t		sat_len;
 	sa_family_t	sat_family;
-	u_int8_t        sat_port;
+	uint8_t		sat_port;
 	struct at_addr  sat_addr;
 	union {
 		struct netrange r_netrange;
 		char            r_zero[8];	/* Hide a struct netrange in
 						 * here */
 	} sat_range;
 };
 #define sat_zero sat_range.r_zero
 #ifdef _KERNEL
 #include <sys/protosw.h>
 extern struct domain atalkdomain;
 extern const struct protosw atalksw[];
 #endif
 #if defined(_KERNEL) || defined(_TEST)
 #define ATALK_ADDRSTRLEN 10
 extern struct domain atalkdomain;
 int at_print(char *, size_t, const struct at_addr *);
 int sat_print(char *, size_t, const void *);
 #endif
 #endif	/* !_NETATALK_AT_H_ */

/*	$NetBSD: at_print.c,v 1.1 2014/12/02 19:33:44 christos Exp $	*/

/*-
 * Copyright (c) 2014 The NetBSD Foundation, Inc.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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>

#include <sys/types.h>
#ifdef _KERNEL
__KERNEL_RCSID(0, "$NetBSD: at_print.c,v 1.1 2014/12/02 19:33:44 christos Exp $");
#include <sys/systm.h>
#else
__RCSID("$NetBSD: at_print.c,v 1.1 2014/12/02 19:33:44 christos Exp $");
#include <stdio.h>
#endif
#include <netatalk/at.h>

int
at_print(char *buf, size_t len, const struct at_addr *aa)
{
	return snprintf(buf, len, "%hu.%hhu", ntohs(aa->s_net), aa->s_node);
}

// XXX: netrange
int
sat_print(char *buf, size_t len, const void *v)
{
	const struct sockaddr_at *sat = v;
	const struct at_addr *aa = &sat->sat_addr;
	char abuf[ATALK_ADDRSTRLEN];

	if (!sat->sat_port)
		return at_print(buf, len, aa);

	at_print(abuf, sizeof(abuf), aa);
	return snprintf(buf, len, "%s:%hhu", abuf, sat->sat_port);
}

--- src/sys/netatalk/files.netatalk 2002/10/10 22:10:53	1.1
+++ src/sys/netatalk/files.netatalk 2014/12/02 19:33:44	1.2

 @@ -1,11 +1,12 @@
-#	$NetBSD: files.netatalk,v 1.1 2002/10/10 22:10:53 thorpej Exp $
+#	$NetBSD: files.netatalk,v 1.2 2014/12/02 19:33:44 christos Exp $
 defflag opt_atalk.h			NETATALK
 file	netatalk/aarp.c			netatalk
 file	netatalk/at_control.c		netatalk
 file	netatalk/at_print.c
 file	netatalk/at_proto.c		netatalk
 file	netatalk/at_rmx.c		netatalkdebug
 file	netatalk/ddp_input.c		netatalk
 file	netatalk/ddp_output.c		netatalk
 file	netatalk/ddp_usrreq.c		netatalk