Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pbrd more more #27

Merged
merged 2 commits into from
Mar 17, 2018
Merged

Pbrd more more #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5f5671
pbrd, lib: properly handle nexthop-group changes
qlyoung Mar 16, 2018
c2754ca
pbrd: remove pbr_event.[ch]
qlyoung Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/nexthop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ void nexthop_del_labels(struct nexthop *nexthop)
}
}

const char *nexthop2str(struct nexthop *nexthop, char *str, int size)
const char *nexthop2str(const struct nexthop *nexthop, char *str, int size)
{
switch (nexthop->type) {
case NEXTHOP_TYPE_IFINDEX:
Expand Down
2 changes: 1 addition & 1 deletion lib/nexthop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ extern int nexthop_same_no_recurse(const struct nexthop *next1,
extern int nexthop_labels_match(struct nexthop *nh1, struct nexthop *nh2);
extern int nexthop_same_firsthop(struct nexthop *next1, struct nexthop *next2);

extern const char *nexthop2str(struct nexthop *nexthop, char *str, int size);
extern const char *nexthop2str(const struct nexthop *nexthop, char *str, int size);
extern struct nexthop *nexthop_next(struct nexthop *nexthop);
extern unsigned int nexthop_level(struct nexthop *nexthop);
#endif /*_LIB_NEXTHOP_H */
135 changes: 0 additions & 135 deletions pbrd/pbr_event.c
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions pbrd/pbr_event.h
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions pbrd/pbr_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
#include "pbr_nht.h"
#include "pbr_map.h"
#include "pbr_zebra.h"
#include "pbr_event.h"
#include "pbr_vty.h"
#include "pbr_debug.h"

Expand Down Expand Up @@ -84,7 +83,6 @@ static void sigint(void)
{
zlog_notice("Terminating on signal");

pbr_event_stop();
exit(0);
}

Expand Down Expand Up @@ -156,7 +154,6 @@ int main(int argc, char **argv, char **envp)
pbr_nhgroup_del_nexthop_cb,
pbr_nhgroup_delete_cb);

pbr_event_init();
pbr_nht_init();
pbr_map_init();
pbr_zebra_init();
Expand Down
Loading