- added wide copyright, if missing

- put ifdef in .h files to prevent recursive inclusion.
kame · May 25, 2005 · 8397e3c · 8397e3c
1 parent 257afef
commit 8397e3c
Show file tree

Hide file tree

Showing 18 changed files with 120 additions and 24 deletions.
diff --git a/kame/kame/shisad/babymdd.c b/kame/kame/shisad/babymdd.c
@@ -1,4 +1,5 @@
-/*      $Id: babymdd.c,v 1.8 2005/05/17 10:31:24 keiichi Exp $  */
+/*	$Id: babymdd.c,v 1.9 2005/05/25 01:49:23 keiichi Exp $	*/
+
 /*
  * Copyright (C) 2004 WIDE Project.  All rights reserved.
  *
@@ -96,7 +97,7 @@ struct mdd_info babyinfo;
 void
 baby_usage()
 {
-        fprintf(stderr, "babymdd [options] -h mipif interfaces..\n");
+	fprintf(stderr, "babymdd [options] -h mipif interfaces..\n");
 	fprintf(stderr, "\t-h mipif      specify your mip pseudo interface\n");
 	fprintf(stderr, "\tinterfaces    specify interfaces\n");
 	fprintf(stderr, "Options\n");

diff --git a/kame/kame/shisad/babymdd.h b/kame/kame/shisad/babymdd.h
@@ -1,3 +1,36 @@
+/*	$Id: babymdd.h,v 1.3 2005/05/25 01:49:23 keiichi Exp $	*/
+
+/*
+ * Copyright (C) 2004 WIDE Project.  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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
+ */
+
+#ifndef _SHISAD_BABYMDD_H_
+#define _SHISAD_BABYMDD_H_
+
 #define DEFAULT_CONFFILE "./mdd.conf"
 #define DEFAULT_POLL 0
 #define DEFAULT_DEBUG 0
@@ -56,3 +89,5 @@ struct if_info {
 	int priority;
 	int linkstatus;
 };
+
+#endif /* _SHISAD_BABYMDD_H_ */
diff --git a/kame/kame/shisad/binding.c b/kame/kame/shisad/binding.c
@@ -1,4 +1,5 @@
-/*      $KAME: binding.c,v 1.13 2005/04/21 13:57:15 t-momose Exp $	*/
+/*	$KAME: binding.c,v 1.14 2005/05/25 01:49:23 keiichi Exp $	*/
+
 /*
  * Copyright (C) 2004 WIDE Project.  All rights reserved.
  *

diff --git a/kame/kame/shisad/callout.h b/kame/kame/shisad/callout.h
@@ -1,4 +1,4 @@
-/*	$KAME: callout.h,v 1.3 2005/02/12 15:22:38 t-momose Exp $	*/
+/*	$KAME: callout.h,v 1.4 2005/05/25 01:49:23 keiichi Exp $	*/
 
 /*
  * Copyright (C) 2004 WIDE Project.
@@ -29,6 +29,9 @@
  * SUCH DAMAGE.
  */
 
+#ifndef _SHISAD_CALLOUT_H_
+#define _SHISAD_CALLOUT_H_
+
 struct callout_queue_t {
 	TAILQ_ENTRY(callout_queue_t) callout_entry;
 
@@ -52,3 +55,4 @@ void update_callout_entry(CALLOUT_HANDLE ch, int);
 int get_next_timeout();
 void show_callout_table(int, char *);
 
+#endif /* _SHISAD_CALLOUT_H_ */
diff --git a/kame/kame/shisad/cfparse.y b/kame/kame/shisad/cfparse.y
@@ -1,8 +1,8 @@
-/*	$KAME: cfparse.y,v 1.4 2005/05/25 01:30:35 keiichi Exp $	*/
+/*	$KAME: cfparse.y,v 1.5 2005/05/25 01:49:23 keiichi Exp $	*/
 
 %{
 /*
- * Copyright (C) 2002 WIDE Project.
+ * Copyright (C) 2005 WIDE Project.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/kame/kame/shisad/command.h b/kame/kame/shisad/command.h
@@ -1,4 +1,4 @@
-/*	$KAME: command.h,v 1.2 2005/02/12 15:22:39 t-momose Exp $	*/
+/*	$KAME: command.h,v 1.3 2005/05/25 01:49:23 keiichi Exp $	*/
 
 /*
  * Copyright (C) 2004 WIDE Project.
@@ -29,6 +29,9 @@
  * SUCH DAMAGE.
  */
 
+#ifndef _SHISAD_COMMAND_H_
+#define _SHISAD_COMMAND_H_
+
 struct command_table {
 	char *command;
 	void (*cmdfunc)(int, char *);
@@ -39,3 +42,4 @@ struct command_table {
 int command_init(char *, struct command_table *, size_t, u_short);
 void command_printf(int s, const char *fmt, ...);
 
+#endif /* _SHISAD_COMMAND_H_ */
diff --git a/kame/kame/shisad/common.c b/kame/kame/shisad/common.c
@@ -1,4 +1,5 @@
-/*      $KAME: common.c,v 1.17 2005/04/14 06:22:35 suz Exp $  */
+/*	$KAME: common.c,v 1.18 2005/05/25 01:49:23 keiichi Exp $	*/
+
 /*
  * Copyright (C) 2004 WIDE Project.  All rights reserved.
  *
@@ -70,7 +71,7 @@
 extern struct mip6_mipif_list mipifhead;
 
 static const struct in6_addr haanyaddr_ifid64 = {
-        {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	   0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe }}
 };
 static const struct in6_addr haanyaddr_ifidnn = {

diff --git a/kame/kame/shisad/config.c b/kame/kame/shisad/config.c
@@ -1,3 +1,33 @@
+/*	$KAME: config.c,v 1.3 2005/05/25 01:49:23 keiichi Exp $	*/
+
+/*
+ * Copyright (C) 2005 WIDE Project.  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. Neither the name of the project 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 PROJECT 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 PROJECT 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/kame/kame/shisad/config.h b/kame/kame/shisad/config.h
@@ -1,3 +1,5 @@
+/*	$KAME: config.h,v 1.4 2005/05/25 01:49:24 keiichi Exp $	*/
+
 /*
  * Copyright (C) 2005 WIDE Project.
  * All rights reserved.

diff --git a/kame/kame/shisad/fdlist.h b/kame/kame/shisad/fdlist.h
@@ -1,4 +1,4 @@
-/*	$KAME: fdlist.h,v 1.1 2004/12/09 02:18:33 t-momose Exp $	*/
+/*	$KAME: fdlist.h,v 1.2 2005/05/25 01:49:24 keiichi Exp $	*/
 
 /*
  * Copyright (C) 2004 WIDE Project.
@@ -29,6 +29,9 @@
  * SUCH DAMAGE.
  */
 
+#ifndef _SHISAD_FDLIST_H_
+#define _SHISAD_FDLIST_H_
+
 struct fd_list {
 	SLIST_ENTRY(fd_list) fdl_entry;
 
@@ -48,3 +51,4 @@ int pollfd_array(void);
 void clear_revents(void);
 void dispatch_fdfunctions(struct pollfd *, int);
 
+#endif /* _SHISAD_FDLIST_H_ */
diff --git a/kame/kame/shisad/fsm.h b/kame/kame/shisad/fsm.h
@@ -1,4 +1,4 @@
-/*	$KAME: fsm.h,v 1.1 2004/12/09 02:18:35 t-momose Exp $	*/
+/*	$KAME: fsm.h,v 1.2 2005/05/25 01:49:24 keiichi Exp $	*/
 
 /*
  * Copyright (C) 2004 WIDE Project.  All rights reserved.
@@ -28,8 +28,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _FSM_H_
-#define _FSM_H_
+#ifndef _SHISAD_FSM_H_
+#define _SHISAD_FSM_H_
 
 /* states for the primary fsm. */
 #define MIP6_BUL_REG_FSM_STATE_IDLE		0
@@ -99,4 +99,4 @@ int bul_kick_fsm(struct binding_update_list *, int, struct fsm_message *);
 void bul_retrans_timer(void *);
 void bul_expire_timer(void *);
 
-#endif /* !_FSM_H_ */
+#endif /* !_SHISAD_FSM_H_ */
diff --git a/kame/kame/shisad/nemo_netconfig.c b/kame/kame/shisad/nemo_netconfig.c
@@ -1,4 +1,5 @@
-/*      $KAME: nemo_netconfig.c,v 1.12 2005/05/24 10:16:19 keiichi Exp $  */
+/*      $KAME: nemo_netconfig.c,v 1.13 2005/05/25 01:49:24 keiichi Exp $  */
+
 /*
  * Copyright (C) 2004 WIDE Project.  All rights reserved.
  *

diff --git a/kame/kame/shisad/nemo_var.c b/kame/kame/shisad/nemo_var.c
@@ -1,4 +1,5 @@
-/*      $KAME: nemo_var.c,v 1.7 2005/05/24 10:16:19 keiichi Exp $  */
+/*      $KAME: nemo_var.c,v 1.8 2005/05/25 01:49:24 keiichi Exp $  */
+
 /*
  * Copyright (C) 2004 WIDE Project.  All rights reserved.
  *

diff --git a/kame/kame/shisad/network.c b/kame/kame/shisad/network.c
@@ -1,4 +1,5 @@
-/*      $KAME: network.c,v 1.5 2005/04/20 04:10:25 t-momose Exp $  */
+/*      $KAME: network.c,v 1.6 2005/05/25 01:49:24 keiichi Exp $  */
+
 /*
  * Copyright (C) 2004 WIDE Project.  All rights reserved.
  *

diff --git a/kame/kame/shisad/rr.c b/kame/kame/shisad/rr.c
@@ -1,4 +1,5 @@
-/*      $KAME: rr.c,v 1.3 2005/04/21 13:57:15 t-momose Exp $  */
+/*      $KAME: rr.c,v 1.4 2005/05/25 01:49:24 keiichi Exp $  */
+
 /*
  * Copyright (C) 2005 WIDE Project.  All rights reserved.
  *

diff --git a/kame/kame/shisad/shisad.h b/kame/kame/shisad/shisad.h
@@ -1,4 +1,5 @@
-/*	$KAME: shisad.h,v 1.15 2005/05/24 10:16:19 keiichi Exp $	*/
+/*	$KAME: shisad.h,v 1.16 2005/05/25 01:49:24 keiichi Exp $	*/
+
 /*
  * Copyright (C) 2004 WIDE Project.
  * All rights reserved.
@@ -28,8 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _SHISAD_H_
-#define _SHISAD_H_
+#ifndef _SHISAD_SHISAD_H_
+#define _SHISAD_SHISAD_H_
 
 extern struct mip6_mninfo mninfo;
 extern int mipsock, mhsock, icmp6sock;
@@ -545,4 +546,5 @@ void command_show_pt(int, char *);
 /* other utility functions */
 char *hexdump(void *, size_t);
 const char *ip6_sprintf(const struct in6_addr *addr);
-#endif /* _SHISAD_H_ */
+
+#endif /* _SHISAD_SHISAD_H_ */
diff --git a/kame/kame/shisad/stat.h b/kame/kame/shisad/stat.h
@@ -1,4 +1,5 @@
-/*      $KAME: stat.h,v 1.3 2005/01/12 11:02:37 t-momose Exp $  */
+/*      $KAME: stat.h,v 1.4 2005/05/25 01:49:24 keiichi Exp $  */
+
 /*
  * Copyright (C) 2004 WIDE Project.  All rights reserved.
  *
@@ -27,6 +28,9 @@
  * SUCH DAMAGE.
  */
 
+#ifndef _SHISAD_STAT_H_
+#define _SHISAD_STAT_H_
+
 struct mip6stat {
 	union _mip6s_mh {
 		u_quad_t _mip6s_imobility[9];
@@ -103,3 +107,6 @@ struct mip6stat {
 };
 
 extern struct mip6stat mip6stat;
+
+#endif /* _SHISAD_STAT_H_ */
+
diff --git a/kame/kame/shisad/util.c b/kame/kame/shisad/util.c
@@ -1,4 +1,5 @@
-/*      $KAME: util.c,v 1.2 2005/05/17 10:31:25 keiichi Exp $  */
+/*      $KAME: util.c,v 1.3 2005/05/25 01:49:24 keiichi Exp $  */
+
 /*
  * Copyright (C) 2005 WIDE Project.  All rights reserved.
  *