blob: 5cdfa29bea4c68501ae3b89b6474b99dcf6abf16 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- bgpctl/bgpctl.c.orig 2009-01-16 23:03:29.000000000 +0900
+++ bgpctl/bgpctl.c 2009-06-24 01:26:24.000000000 +0900
@@ -20,7 +20,6 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <net/if.h>
-#include <net/if_media.h>
#include <net/if_types.h>
#include <err.h>
@@ -29,14 +28,20 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <util.h>
#include "bgpd.h"
#include "session.h"
#include "rde.h"
#include "log.h"
#include "parser.h"
+#include "util.h"
#include "irrfilter.h"
+#include "if_media.h"
+#include "compat-openbsd.h"
+
+#if defined(__FreeBSD__) /* FreeBSD has no LINK_STATE_IS_UP macro. */
+#define LINK_STATE_IS_UP(_s) ((_s) >= LINK_STATE_UP)
+#endif /* defined(__FreeBSD__) */
enum neighbor_views {
NV_DEFAULT,
@@ -84,7 +89,7 @@
struct imsgbuf *ibuf;
-__dead void
+ void
usage(void)
{
extern char *__progname;
@@ -677,7 +682,7 @@
}
void
-print_timer(const char *name, timer_t d)
+print_timer(const char *name, time_t d)
{
printf(" %-20s ", name);
|
