Browse files

several codes are cleaned up

  • Loading branch information...
1 parent bf224ca commit bc22f36f7b0788b911adcf3805ef7cad5541654d t-momose committed Feb 6, 2007
Showing with 24 additions and 22 deletions.
  1. +3 −2 kame/kame/shisad/cnd.c
  2. +2 −3 kame/kame/shisad/common.c
  3. +4 −1 kame/kame/shisad/had.c
  4. +13 −14 kame/kame/shisad/shisa.8
  5. +2 −2 kame/kame/shisad/shisad.h
View
5 kame/kame/shisad/cnd.c
@@ -1,4 +1,4 @@
-/* $KAME: cnd.c,v 1.18 2006/09/29 08:00:51 t-momose Exp $ */
+/* $KAME: cnd.c,v 1.19 2007/02/06 05:58:52 t-momose Exp $ */
/*
* Copyright (C) 2004 WIDE Project.
@@ -106,7 +106,6 @@ cn_usage(path)
else
cmd++;
fprintf(stderr, "%s [-fn] [-c configfile]\n", cmd);
- exit(0);
}
@@ -134,6 +133,8 @@ main(argc, argv)
default:
fprintf(stderr, "unknown option\n");
cn_usage(argv[0]);
+ exit(0);
+ /* Not reach */
break;
}
}
View
5 kame/kame/shisad/common.c
@@ -1,4 +1,4 @@
-/* $KAME: common.c,v 1.32 2007/02/02 17:35:59 t-momose Exp $ */
+/* $KAME: common.c,v 1.33 2007/02/06 05:58:52 t-momose Exp $ */
/*
* Copyright (C) 2004 WIDE Project. All rights reserved.
@@ -181,8 +181,7 @@ icmp6sock_open()
#endif /* MIP_MN || MIP_HA */
if (setsockopt(icmp6sock, IPPROTO_ICMPV6,
ICMP6_FILTER, &filter, sizeof(filter)) < 0) {
- perror("setsockopt ICMP6_FILTER");
- exit(1);
+ syslog(LOG_ERR, "setsockopt ICMP6_FILTER was failed. but the system continues.");
}
syslog(LOG_INFO, "ICMP6 socket is %d.", icmp6sock);
View
5 kame/kame/shisad/had.c
@@ -1,4 +1,4 @@
-/* $KAME: had.c,v 1.41 2007/01/14 05:15:23 t-momose Exp $ */
+/* $KAME: had.c,v 1.42 2007/02/06 05:58:52 t-momose Exp $ */
/*
* Copyright (C) 2004 WIDE Project.
@@ -171,10 +171,13 @@ main(argc, argv)
char *conffile = HAD_CONFFILE;
char *options = "fnc:";
+#if 0
+ /* XXX Is this code needed ? */
if (argc < 1) {
ha_usage(argv[0]);
exit (0);
}
+#endif
/* get options */
ifname = NULL;
View
27 kame/kame/shisad/shisa.8
@@ -1,4 +1,4 @@
-.\" $KAME: shisa.8,v 1.1 2007/02/02 08:58:59 t-momose Exp $
+.\" $KAME: shisa.8,v 1.2 2007/02/06 05:58:52 t-momose Exp $
.\"
.\" Copyright (C) 2004-2007 WIDE Project.
.\" All rights reserved.
@@ -41,16 +41,6 @@ is an implemenation of Mobile IPv6(MIPv6) based on RFC3775, and NEMO based on RF
supports most of features specified RFC3775, RFC3776 and RFC3963 to be a mobile node, a correspondent node, a home agent and a mobile router.
And also some other specifications partially.
.Pp
-The name of
-.Nm
-is derived from a name of a lion-shaped roof ornament of Okinawa, the south island in Japan.
-The shisa implemenation team had the 1st camp in Okinawa in 2004 spring and
-.Nm
-was borned there.
-The team named the MIP6/NEMO code
-.Nm
-after the famous ornament in the birthplace.
-.Pp
.Nm
consists of kernel parts and several userland daemons.
Operating packets such as inserting or extracting extention headers specialized for MIPv6, and handling tunnelled packets are done in the kernel side.
@@ -71,9 +61,18 @@ intorduces a new interface between kernel and userland, which is called 'mobilit
.Xr http://www.mobileip.jp/
.\"
.Sh HISTORY
-The
+The name of
+.Nm
+is derived from a name of a lion-shaped roof ornament of Okinawa, the south island in Japan.
+The shisa implemenation team had the 1st camp in Okinawa in 2004 spring and
+.Nm
+was born there.
+The team named the MIP6/NEMO code
+.Nm
+after the famous ornament in the birthplace.
+.Pp
+And The
.Nm
-was born in 2004 and merged into the kame source tree in December 2004.
+was merged into the kame source tree in December 2004.
.Sh BUGS
Nothing.
-
View
4 kame/kame/shisad/shisad.h
@@ -1,4 +1,4 @@
-/* $KAME: shisad.h,v 1.42 2007/01/13 18:46:21 keiichi Exp $ */
+/* $KAME: shisad.h,v 1.43 2007/02/06 05:58:52 t-momose Exp $ */
/*
* Copyright (C) 2004 WIDE Project.
@@ -602,7 +602,7 @@ int set_default_bu_lifetime(struct mip6_hoainfo *);
int receive_hadisc_reply(struct mip6_dhaad_rep *, size_t);
int receive_mpa(struct mip6_prefix_advert *, size_t, struct binding_update_list *);
struct noro_host_list *noro_get(struct in6_addr *);
-void noro_add(struct in6_addr *);
+int noro_add(struct in6_addr *);
void hpfxlist_expire_timer(void *);
#ifdef DSMIP
struct in_addr *mnd_get_v4hoa_by_ifindex(u_int16_t);

0 comments on commit bc22f36

Please sign in to comment.