diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/command.c | 4 | ||||
| -rw-r--r-- | lib/command.h | 4 | ||||
| -rw-r--r-- | lib/log.c | 4 | ||||
| -rw-r--r-- | lib/log.h | 8 | ||||
| -rw-r--r-- | lib/memtypes.c | 4 | ||||
| -rw-r--r-- | lib/route_types.awk | 4 | ||||
| -rw-r--r-- | lib/sockopt.c | 14 | ||||
| -rw-r--r-- | lib/sockopt.h | 3 | ||||
| -rw-r--r-- | lib/sockunion.c | 52 |
9 files changed, 97 insertions, 0 deletions
diff --git a/lib/command.c b/lib/command.c index 4887f94f..0ca86dd3 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1,5 +1,9 @@ /* +<<<<<<< HEAD:lib/command.c + $Id: command.c,v 1.55 2007/04/28 22:14:10 ajs Exp $ +======= $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/command.c Command interpreter routine for virtual terminal [aka TeletYpe] Copyright (C) 1997, 98, 99 Kunihiro Ishiguro diff --git a/lib/command.h b/lib/command.h index d093df3c..5a19874d 100644 --- a/lib/command.h +++ b/lib/command.h @@ -101,7 +101,11 @@ enum node_type DUMP_NODE, /* Packet dump node. */ FORWARDING_NODE, /* IP forwarding node. */ PROTOCOL_NODE, /* protocol filtering node */ +<<<<<<< HEAD:lib/command.h + VTY_NODE /* Vty node. */ +======= VTY_NODE, /* Vty node. */ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/command.h }; /* Node which has some commands and prompt string and configuration @@ -1,5 +1,9 @@ /* +<<<<<<< HEAD:lib/log.c + * $Id: log.c,v 1.34 2008/02/28 23:26:02 paul Exp $ +======= * $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/log.c * * Logging of zebra * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro @@ -1,5 +1,9 @@ /* +<<<<<<< HEAD:lib/log.h + * $Id: log.h,v 1.20 2008/02/28 23:26:02 paul Exp $ +======= * $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/log.h * * Zebra logging funcions. * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro @@ -144,7 +148,11 @@ extern int zlog_rotate (struct zlog *); /* For hackey massage lookup and check */ #define LOOKUP(x, y) mes_lookup(x, x ## _max, y, "(no item found)") +<<<<<<< HEAD:lib/log.h +extern const char *lookup (struct message *, int); +======= extern const char *lookup (const struct message *, int); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/log.h extern const char *mes_lookup (struct message *meslist, int max, int index, const char *no_item); diff --git a/lib/memtypes.c b/lib/memtypes.c index dd365ddb..bec6663c 100644 --- a/lib/memtypes.c +++ b/lib/memtypes.c @@ -6,7 +6,11 @@ * The script is sensitive to the format (though not whitespace), see * the top of memtypes.awk for more details. * +<<<<<<< HEAD:lib/memtypes.c + * $Id: memtypes.c,v 1.13 2008/07/21 21:02:50 paul Exp $ +======= * $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/memtypes.c */ #include "zebra.h" diff --git a/lib/route_types.awk b/lib/route_types.awk index eb3d382a..e5c8e496 100644 --- a/lib/route_types.awk +++ b/lib/route_types.awk @@ -1,4 +1,8 @@ +<<<<<<< HEAD:lib/route_types.awk +# $Id: route_types.awk,v 1.3 2006/06/27 10:42:18 paul Exp $ +======= # $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/route_types.awk # # Scan a file of route-type definitions (see eg route_types.txt) and # generate a corresponding header file with: diff --git a/lib/sockopt.c b/lib/sockopt.c index 4ba7e874..b07a3fc2 100644 --- a/lib/sockopt.c +++ b/lib/sockopt.c @@ -499,7 +499,10 @@ int sockopt_tcp_signature (int sock, union sockunion *su, const char *password) { #if HAVE_DECL_TCP_MD5SIG +<<<<<<< HEAD:lib/sockopt.c +======= int ret; +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.c #ifndef GNU_LINUX /* * XXX Need to do PF_KEY operation here to add/remove an SA entry, @@ -510,6 +513,10 @@ sockopt_tcp_signature (int sock, union sockunion *su, const char *password) int keylen = password ? strlen (password) : 0; struct tcp_md5sig md5sig; union sockunion *su2, *susock; +<<<<<<< HEAD:lib/sockopt.c + int ret; +======= +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.c /* Figure out whether the socket and the sockunion are the same family.. * adding AF_INET to AF_INET6 needs to be v4 mapped, you'd think.. @@ -553,9 +560,16 @@ sockopt_tcp_signature (int sock, union sockunion *su, const char *password) md5sig.tcpm_keylen = keylen; if (keylen) memcpy (md5sig.tcpm_key, password, keylen); +<<<<<<< HEAD:lib/sockopt.c +======= sockunion_free (susock); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.c #endif /* GNU_LINUX */ ret = setsockopt (sock, IPPROTO_TCP, TCP_MD5SIG, &md5sig, sizeof md5sig); +<<<<<<< HEAD:lib/sockopt.c + sockunion_free (susock); +======= +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.c return ret; #else /* HAVE_TCP_MD5SIG */ return -2; diff --git a/lib/sockopt.h b/lib/sockopt.h index cb05c6fb..db2f94f0 100644 --- a/lib/sockopt.h +++ b/lib/sockopt.h @@ -89,7 +89,10 @@ extern int setsockopt_multicast_ipv4(int sock, int optname, unsigned int ifindex /* optional: if non-zero, may be used instead of if_addr */); +<<<<<<< HEAD:lib/sockopt.h +======= extern int setsockopt_ipv4_tos(int sock, int tos); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.h /* Ask for, and get, ifindex, by whatever method is supported. */ extern int setsockopt_ifindex (int, int, int); diff --git a/lib/sockunion.c b/lib/sockunion.c index 8fbe3450..3052063f 100644 --- a/lib/sockunion.c +++ b/lib/sockunion.c @@ -225,6 +225,8 @@ sockunion_su2str (union sockunion *su) #endif /* HAVE_IPV6 */ } return XSTRDUP (MTYPE_TMP, str); +<<<<<<< HEAD:lib/sockunion.c +======= } /* Convert IPv4 compatible IPv6 address to IPv4 address. */ @@ -243,6 +245,7 @@ sockunion_normalise_mapped (union sockunion *su) memcpy (su, &sin, sizeof (struct sockaddr_in)); } #endif /* HAVE_IPV6 */ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockunion.c } /* Return socket of sockunion. */ @@ -271,6 +274,26 @@ sockunion_accept (int sock, union sockunion *su) len = sizeof (union sockunion); client_sock = accept (sock, (struct sockaddr *) su, &len); +<<<<<<< HEAD:lib/sockunion.c + /* Convert IPv4 compatible IPv6 address to IPv4 address. */ +#if 0 +#ifdef HAVE_IPV6 + if (su->sa.sa_family == AF_INET6) + { + if (IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr)) + { + struct sockaddr_in sin; + + memset (&sin, 0, sizeof (struct sockaddr_in)); + sin.sin_family = AF_INET; + memcpy (&sin.sin_addr, ((char *)&su->sin6.sin6_addr) + 12, 4); + memcpy (su, &sin, sizeof (struct sockaddr_in)); + } + } +#endif /* HAVE_IPV6 */ +#endif +======= +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockunion.c return client_sock; } @@ -593,7 +616,22 @@ sockunion_getsockname (int fd) { su = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion)); memcpy (su, &name, sizeof (struct sockaddr_in6)); +<<<<<<< HEAD:lib/sockunion.c + +#if 0 + if (IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr)) + { + struct sockaddr_in sin; + + sin.sin_family = AF_INET; + memcpy (&sin.sin_addr, ((char *)&su->sin6.sin6_addr) + 12, 4); + sin.sin_port = su->sin6.sin6_port; + memcpy (su, &sin, sizeof (struct sockaddr_in)); + } +#endif +======= sockunion_normalise_mapped (su); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockunion.c return su; } #endif /* HAVE_IPV6 */ @@ -638,7 +676,21 @@ sockunion_getpeername (int fd) { su = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion)); memcpy (su, &name, sizeof (struct sockaddr_in6)); +<<<<<<< HEAD:lib/sockunion.c +#if 0 + if (IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr)) + { + struct sockaddr_in sin; + + sin.sin_family = AF_INET; + memcpy (&sin.sin_addr, ((char *)&su->sin6.sin6_addr) + 12, 4); + sin.sin_port = su->sin6.sin6_port; + memcpy (su, &sin, sizeof (struct sockaddr_in)); + } +#endif +======= sockunion_normalise_mapped (su); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockunion.c return su; } #endif /* HAVE_IPV6 */ |