Skip to content

Build fix for Ubuntu/Debian/others?; quiet mode; select IP protocols #13

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

Merged
waehlisch merged 4 commits into from
Jun 25, 2018
Merged

Build fix for Ubuntu/Debian/others?; quiet mode; select IP protocols #13

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
498e554
add options for quiet mode and IPv4/v6 selection
remcovanmook Jun 22, 2018
5c7e3f0
Fix coredump and add startup message
remcovanmook Jun 22, 2018
fd7465a
Fix build for Ubuntu/Debian
remcovanmook Jun 22, 2018
9b0dc23
added daemon and pidfile support
remcovanmook Jun 23, 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
Prev Previous commit
Next Next commit
Fix coredump and add startup message
  • Loading branch information
@remcovanmook
remcovanmook committed Jun 22, 2018
commit 5c7e3f02b4dc1a12f6bbec833214fa0f1fa11192
36 changes: 20 additions & 16 deletions bird-rtrlib-cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,7 @@ void cleanup_bird_command(void)
*/
void init(void)
{
if (config.quiet == true) {
openlog(NULL, LOG_PERROR, LOG_DAEMON);
} else {
openlog(NULL, LOG_PERROR | LOG_CONS | LOG_PID, LOG_DAEMON);
}
openlog(NULL, LOG_PERROR | LOG_CONS | LOG_PID, LOG_DAEMON);
}

/**
Expand Down Expand Up @@ -156,19 +152,22 @@ static void pfx_update_callback(struct pfx_table *table,
// Fetch IP address as string.
lrtr_ip_addr_to_str(&(record.prefix), ip_addr_str, sizeof(ip_addr_str));
// Crude way of filtering out sending Bird the wrong kind of updates
int prefix_allowed = 0;
if (strchr(ip_addr_str,'.') != NULL)
{
if ( strchr(config.ip_version, '4') != NULL )
prefix_allowed++;
}
if (strchr(ip_addr_str,':') != NULL)
if (config.ip_version)
{
if ( strchr(config.ip_version, '6') != NULL )
prefix_allowed++;
int prefix_allowed = 0;
if (strchr(ip_addr_str,'.') != NULL)
{
if ( strchr(config.ip_version, '4') != NULL )
prefix_allowed++;
}
if (strchr(ip_addr_str,':') != NULL)
{
if ( strchr(config.ip_version, '6') != NULL )
prefix_allowed++;
}
if (prefix_allowed == 0)
return;
}
if (prefix_allowed == 0)
return;
// Write BIRD command to buffer.
if (
snprintf(
Expand Down Expand Up @@ -309,6 +308,11 @@ int main(int argc, char *argv[])
// start rtr_mgr
rtr_mgr_start(conf);
// Server loop. Read commands from stdin.
fprintf(stdout, "bird-rtrlib-cli connected to %s:%s ready for IP versions %s.\nType 'exit' to clean up and quit.\n",
config.rtr_host,
config.rtr_port,
config.ip_version ? config.ip_version : "all"
);
while (getline(&command, &command_len, stdin) != -1) {
if (strncmp(command, CMD_EXIT, strlen(CMD_EXIT)) == 0)
break;
Expand Down