diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-03-30 11:04:12 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-03-30 11:04:12 +0200 |
| commit | bf2abe2f515d7b7aaed5fb4f37af82169adcd2f2 (patch) | |
| tree | 158a3edcfa3a79a954cb5a26989929120ec8912b /proto/pipe/pipe.h | |
| parent | fb829de69052755a31d76d73e17525d050e5ff4d (diff) | |
| parent | c0adf7e9fc0bb920175a639c6f56ed7b4190f3e4 (diff) | |
Merge branch 'soon'
Conflicts:
nest/proto.c
nest/rt-table.c
Diffstat (limited to 'proto/pipe/pipe.h')
| -rw-r--r-- | proto/pipe/pipe.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/proto/pipe/pipe.h b/proto/pipe/pipe.h index fbd21291..50b31698 100644 --- a/proto/pipe/pipe.h +++ b/proto/pipe/pipe.h @@ -20,7 +20,8 @@ struct pipe_config { struct pipe_proto { struct proto p; - struct rtable *peer; + struct rtable *peer_table; + struct announce_hook *peer_ahook; /* Announce hook for direction peer->primary */ struct proto_stats peer_stats; /* Statistics for the direction peer->primary */ int mode; /* PIPE_OPAQUE or PIPE_TRANSPARENT */ }; @@ -31,10 +32,4 @@ extern struct protocol proto_pipe; static inline int proto_is_pipe(struct proto *p) { return p->proto == &proto_pipe; } -static inline struct rtable * pipe_get_peer_table(struct proto *P) -{ return ((struct pipe_proto *) P)->peer; } - -static inline struct proto_stats * pipe_get_peer_stats(struct proto *P) -{ return &((struct pipe_proto *) P)->peer_stats; } - #endif |