diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2009-06-30 07:35:13 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2009-06-30 07:35:13 +0000 |
| commit | 7f31ff4f937cb0e17224ee7d8e11dd7d2a690462 (patch) | |
| tree | 669ea07e99a7f19513f560292a84a25a34c55626 /net/openbgpd/files/patch-bgpd_bgpd.h | |
| parent | - FIx client-hook to be workable (diff) | |
Simplify Makefile. No change of the resultant package.
Notes
Notes:
svn path=/head/; revision=236799
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_bgpd.h')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_bgpd.h | 56 |
1 files changed, 15 insertions, 41 deletions
diff --git a/net/openbgpd/files/patch-bgpd_bgpd.h b/net/openbgpd/files/patch-bgpd_bgpd.h index 64824eb9fee1..992274118267 100644 --- a/net/openbgpd/files/patch-bgpd_bgpd.h +++ b/net/openbgpd/files/patch-bgpd_bgpd.h @@ -1,50 +1,24 @@ ---- bgpd/bgpd.h.orig Thu Jul 19 12:52:38 2007 -+++ bgpd/bgpd.h Thu Jul 19 12:52:28 2007 -@@ -30,9 +30,11 @@ +Index: bgpd/bgpd.h +=================================================================== +RCS file: /home/cvs/private/hrs/openbgpd/bgpd/bgpd.h,v +retrieving revision 1.1.1.1 +retrieving revision 1.3 +diff -u -p -r1.1.1.1 -r1.3 +--- bgpd/bgpd.h 30 Jun 2009 05:46:15 -0000 1.1.1.1 ++++ bgpd/bgpd.h 30 Jun 2009 06:56:51 -0000 1.3 +@@ -30,9 +30,15 @@ #include <poll.h> #include <stdarg.h> -+#define RTA_LABEL 0 ++#if defined(__FreeBSD__) /* compat */ ++#include "openbsd-compat.h" ++#endif /* defined(__FreeBSD__) */ + #define BGP_VERSION 4 #define BGP_PORT 179 --#define CONFFILE "/etc/bgpd.conf" -+#define CONFFILE "%%PREFIX%%/etc/bgpd.conf" ++#ifndef CONFFILE + #define CONFFILE "/etc/bgpd.conf" ++#endif /* !CONFFILE */ #define BGPD_USER "_bgpd" #define PEER_DESCR_LEN 32 #define PFTABLE_LEN 16 -@@ -467,12 +469,12 @@ - - struct kroute_label { - struct kroute kr; -- char label[RTLABEL_LEN]; -+ char label[PFTABLE_LEN]; - }; - - struct kroute6_label { - struct kroute6 kr; -- char label[RTLABEL_LEN]; -+ char label[PFTABLE_LEN]; - }; - - #define F_RIB_ELIGIBLE 0x01 -@@ -644,7 +646,7 @@ - struct bgpd_addr nexthop; - struct filter_community community; - char pftable[PFTABLE_LEN]; -- char rtlabel[RTLABEL_LEN]; -+ char rtlabel[PFTABLE_LEN]; - } action; - enum action_types type; - }; -@@ -709,8 +711,8 @@ - void log_warnx(const char *, ...); - void log_info(const char *, ...); - void log_debug(const char *, ...); --void fatal(const char *) __dead; --void fatalx(const char *) __dead; -+void fatal(const char *) ; -+void fatalx(const char *) ; - - /* parse.y */ - int cmdline_symset(char *); |