 @@ -1,14 +1,14 @@
-/*	$NetBSD: isibootd.c,v 1.1 2011/12/17 13:24:18 tsutsui Exp $	*/
+/*	$NetBSD: isibootd.c,v 1.2 2011/12/18 14:45:23 tsutsui Exp $	*/
 /*	Id: isiboot.c,v 1.2 1999/12/26 14:33:33 nisimura Exp 	*/
 /*-
  * Copyright (c) 2000, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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
 @@ -52,39 +52,39 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #define	TRACE(l, x) if ((l) <= dbg) printf x
 /*
  * TRFS (Integrated Solutions Inc. Transparent Remote File System) frame
+ *
  * Following data format depends on m68k order, and aligned harmful
  * to RISC processors.
  */
-#define	FRAMETYPE	0x80df
+#define	TRFS_FRAMETYPE	0x80df
-#define	FRAMELEN	1468
+#define	TRFS_FRAMELEN	1468
 struct frame {
 	uint8_t dst[ETHER_ADDR_LEN];
 	uint8_t src[ETHER_ADDR_LEN];
 	uint16_t type;
 	uint16_t pad_0;
 	uint16_t seqno;
 	uint8_t opcode;
 	uint8_t pad_1;
 	uint8_t pos[4];
 	uint8_t siz[4];
-	uint8_t data[FRAMELEN - 28];
+	uint8_t data[TRFS_FRAMELEN - 28];
 } __packed;
 struct station {
 	int 	fd;
 	char	name[MAXHOSTNAMELEN];
 	char	ifname[IFNAMSIZ];
 	uint8_t addr[ETHER_ADDR_LEN];
 } station;
 struct session {
 	struct session *next;
 	int state;
 	FILE *file;
 @@ -102,27 +102,27 @@ static __unused const char *state[] = {
 #define	READ	2
 #define	CLOSE	4
 static __unused const char *op[] =
     { "CONNECT", "OPEN", "READ", "WRITE", "CLOSE", "FIND" };
 static void createbpfport(char *, uint8_t **, size_t *, struct station *);
 static struct session *search(uint8_t *);
 static void closedown(struct session *);
 static void makepool(void);
 static char *etheraddr(uint8_t *);
 static int pickif(char *, uint8_t *);
 static __dead void usage(void);
-#define	FRAME(buf)	((buf) + ((struct bpf_hdr *)(buf))->bh_hdrlen)
+#define	TRFS_FRAME(buf)	((buf) + ((struct bpf_hdr *)(buf))->bh_hdrlen)
 #define	PATH_DEFBOOTDIR	"/tftpboot"
 int
 main(int argc, char *argv[])
+{
 	int cc, dbg, dflag;
 	size_t iolen;
 	uint32_t pos, siz;
 	size_t nread;
 	char *ifname, *p;
 	const char *bootwd, *servername, *filename;
 	uint8_t *iobuf;
 @@ -175,27 +175,27 @@ main(int argc, char *argv[])
 #ifdef __NetBSD__
 		pidfile(NULL);
 #endif
+	}
 	if (chdir(bootwd) < 0)
 		err(EXIT_FAILURE, "can not chdir to %s", bootwd);
 	pollfd.fd = station.fd;
 	pollfd.events = POLLIN;
 	for (;;) {
 		poll(&pollfd, 1, INFTIM);
 		read(pollfd.fd, iobuf, iolen);	/* returns 1468 */
-		fp = (struct frame *)FRAME(iobuf);
+		fp = (struct frame *)TRFS_FRAME(iobuf);
 		/* ignore own TX packets */
 		if (memcmp(fp->src, station.addr, ETHER_ADDR_LEN) == 0)
 			continue;
 		/* check if the received Ethernet address is in ethers(5) */
 		if (ether_ntohost(clientname, (struct ether_addr *)fp->src)) {
 			TRACE(3, ("'%s' is not in ethers(5)\n",
 			    etheraddr(fp->src)));
 			continue;
+		}
 		/* check if the client has a valid hostname */
 		clientname[sizeof(clientname) - 1] = '\0';
 @@ -259,27 +259,27 @@ main(int argc, char *argv[])
 				be32enc(fp->siz, 0); /* corrupted file */
+			}
 			TRACE(3, ("%u@%u\n", siz, pos));
 			break;
  aborting:
 			TRACE(1, ("out of phase\n"));
  closedown:
 			closedown(cp);
 			fp->opcode = CLOSE;
 			break;
+		}
 		memcpy(fp->dst, fp->src, ETHER_ADDR_LEN);
 		memcpy(fp->src, station.addr, ETHER_ADDR_LEN);
-		write(pollfd.fd, fp, FRAMELEN);
+		write(pollfd.fd, fp, TRFS_FRAMELEN);
+	}
 	/* NOTREACHED */
+}
 struct session *
 search(uint8_t *client)
+{
 	struct session *cp;
 	for (cp = activelist; cp; cp = cp->next) {
 		if (memcmp(client, cp->addr, ETHER_ADDR_LEN) == 0)
 			return cp;
+	}
 @@ -338,28 +338,28 @@ makepool(void)
 char *
 etheraddr(uint8_t *e)
+{
 	static char address[sizeof("xx:xx:xx:xx:xx:xx")];
 	snprintf(address, sizeof(address), "%02x:%02x:%02x:%02x:%02x:%02x",
 	    e[0], e[1], e[2], e[3], e[4], e[5]);
 	return address;
+}
 static struct bpf_insn bpf_insn[] = {
 	{ BPF_LD|BPF_H|BPF_ABS,  0, 0, offsetof(struct frame, type) },
-	{ BPF_JMP|BPF_JEQ|BPF_K, 0, 1, FRAMETYPE },
+	{ BPF_JMP|BPF_JEQ|BPF_K, 0, 1, TRFS_FRAMETYPE },
-	{ BPF_RET|BPF_K,         0, 0, FRAMELEN },
+	{ BPF_RET|BPF_K,         0, 0, TRFS_FRAMELEN },
 	{ BPF_RET|BPF_K,         0, 0, 0x0 }
 };
 static struct bpf_program bpf_pgm = {
 	sizeof(bpf_insn) / sizeof(bpf_insn[0]),
 	bpf_insn
 };
 void
 createbpfport(char *ifname, uint8_t **iobufp, size_t *iolenp,
     struct station *st)
+{
 	struct ifreq ifr;
 	int fd;