Merge branch 'master' into feature/4-configuration-of-source-ip-address

Conflicts:
	bird-rtrlib-cli.c
	cli.c
	rtr.c
	rtr.h

Author: mceyran

bird-rtrlib-cli.c

@@ -131,7 +131,7 @@ void init_bird_command(void) {
  * @param added
  */
 void rtr_callback(
-    struct pfx_table *table, const pfx_record record, const bool added
+    struct pfx_table *table, const struct pfx_record record, const bool added
 ) {
     // IP address buffer.
     static char ip_addr_str[INET6_ADDRSTRLEN];
@@ -230,8 +230,7 @@ int main(int argc, char *argv[]) {
             rtr_config = rtr_ssh_connect(
                 config.rtr_host, config.rtr_port, config.rtr_bind_addr,
                 config.rtr_ssh_hostkey_file, config.rtr_ssh_username,
-                config.rtr_ssh_privkey_file, config.rtr_ssh_pubkey_file,
-                &rtr_callback
+                config.rtr_ssh_privkey_file, &rtr_callback
             );
             break;
     }

cli.c

@@ -32,8 +32,7 @@
 #define ARGKEY_RTRSSH_ENABLE 's'
 #define ARGKEY_RTRSSH_HOSTKEY 0x101
 #define ARGKEY_RTRSSH_PRIVKEY 0x102
-#define ARGKEY_RTRSSH_PUBKEY 0x103
-#define ARGKEY_RTRSSH_USERNAME 0x104
+#define ARGKEY_RTRSSH_USERNAME 0x103
 
 // Parser function for argp_parse().
 static error_t argp_parser(int key, char *arg, struct argp_state *state) {
@@ -65,9 +64,6 @@ static error_t argp_parser(int key, char *arg, struct argp_state *state) {
         case ARGKEY_RTRSSH_PRIVKEY:
             config->rtr_ssh_privkey_file = arg;
             break;
-        case ARGKEY_RTRSSH_PUBKEY:
-            config->rtr_ssh_pubkey_file = arg;
-            break;
         case ARGKEY_RTRSSH_USERNAME:
             config->rtr_ssh_username = arg;
             break;
@@ -152,16 +148,6 @@ int parse_cli(int argc, char **argv, struct config *config) {
             "used. Uses the user's default identity file if not specified.",
             2
         },
-        {
-            "rtr-ssh-pubkey",
-            ARGKEY_RTRSSH_PUBKEY,
-            "<RTR_SSH_PUBKEY_FILE>",
-            0,
-            "(optional) Path to a file containing the public key of the user "
-            "to be authenticated with the RTR server if an SSH connection is "
-            "used. Uses the user's default public key file if not specified.",
-            2
-        },
         {0}
     };
 

config.h

@@ -44,7 +44,6 @@ struct config {
     char *rtr_ssh_username;
     char *rtr_ssh_hostkey_file;
     char *rtr_ssh_privkey_file;
-    char *rtr_ssh_pubkey_file;
 };
 
 /**

rtr.c

@@ -29,47 +29,22 @@
 // for later cleanup.
 static struct tr_tcp_config *tcp_config = 0;
 
-/**
- * Creates and returns an `rtr_mgr_config` structure from the specified
- * `rtr_mgr_group` structure.
- * @param groups
- * @return
- */
-static struct rtr_mgr_config *rtr_create_mgr_config(
-    rtr_mgr_group *groups, unsigned int count
-) {
-    // Initialize result.
-    struct rtr_mgr_config *result = malloc(sizeof (struct rtr_mgr_config));
-    memset(result, 0, sizeof (struct rtr_mgr_config));
-
-    // Populate result.
-    result->groups = groups;
-    result->len = count;
-
-    // Return result.
-    return result;
-}
-
 /**
  * Creates and returns a `rtr_mgr_group` structure from the specified
  * `rtr_socket` structure array containing the specified number of elements.
  * @param rtr_socket
  * @param count
  * @return
  */
-static rtr_mgr_group *rtr_create_mgr_group(
+static struct rtr_mgr_group *rtr_create_mgr_group(
     struct rtr_socket *sockets, unsigned int count
 ) {
-    // Create a prototype rtr_mgr_group to be able to retrieve its size.
-    // TODO: Remove when rtr_mgr_group is not an anonymous struct anymore.
-    rtr_mgr_group prototype;
-
     // Iterator.
     unsigned int i;
 
     // Initialize result.
-    rtr_mgr_group *result = malloc(sizeof prototype); // TODO: see above
-    memset(result, 0, sizeof prototype); // TODO: see above.
+    struct rtr_mgr_group *result = malloc(sizeof (struct rtr_mgr_group));
+    memset(result, 0, sizeof (struct rtr_mgr_group));
 
     // Populate result.
     result->sockets = malloc(count * sizeof (struct rtr_socket *));
@@ -109,7 +84,6 @@ static struct rtr_socket *rtr_create_rtr_socket(struct tr_socket *socket) {
  * @param server_hostkey_path
  * @param username
  * @param client_privkey_path
- * @param client_pubkey_path
  * @return
  */
 static struct tr_ssh_config *rtr_create_ssh_config(
@@ -118,8 +92,7 @@ static struct tr_ssh_config *rtr_create_ssh_config(
     const char *bindaddr,
     const char *server_hostkey_path,
     const char *username,
-    const char *client_privkey_path,
-    const char *client_pubkey_path
+    const char *client_privkey_path
 ) {
     // Initialize result.
     struct tr_ssh_config *result = malloc(sizeof (struct tr_ssh_config));
@@ -139,8 +112,6 @@ static struct tr_ssh_config *rtr_create_ssh_config(
         result->server_hostkey_path = strdup(server_hostkey_path);
     if (client_privkey_path)
         result->client_privkey_path = strdup(client_privkey_path);
-    if (client_pubkey_path)
-        result->client_pubkey_path = strdup(client_pubkey_path);
 
     // Return result.
     return result;
@@ -256,29 +227,29 @@ void rtr_close(struct rtr_mgr_config *rtr_mgr_config) {
 struct rtr_mgr_config *rtr_ssh_connect(
     const char *host, const char *port, const char *bindaddr,
     const char *hostkey_file, const char *username, const char *privkey_file,
-    const char *pubkey_file, const pfx_update_fp callback
+    const pfx_update_fp callback
 ) {
-    // Create RTR manager config with the single server group.
-    struct rtr_mgr_config *result = rtr_create_mgr_config(
-        rtr_create_mgr_group(
-            rtr_create_rtr_socket(
-                rtr_create_ssh_socket(rtr_create_ssh_config(
-                    host,
-                    strtoul(port, 0, 10),
-                    bindaddr,
-                    hostkey_file,
-                    username,
-                    privkey_file,
-                    pubkey_file
-                ))
-            ),
-            1
+    // Prepare pointer to result config.
+    struct rtr_mgr_config *result;
+
+    // Create the single server group.
+    struct rtr_mgr_group *group = rtr_create_mgr_group(
+        rtr_create_rtr_socket(
+            rtr_create_ssh_socket(rtr_create_ssh_config(
+                host,
+                strtoul(port, 0, 10),
+                bindaddr,
+                hostkey_file,
+                username,
+                privkey_file
+            ))
         ),
         1
     );
 
     // Initialize RTR manager and bail out on error.
-    if (rtr_mgr_init(result, 240, 520, callback) == RTR_ERROR) {
+    result = rtr_mgr_init(group, 1, 240, 520, callback, 0, 0);
+    if (!result) {
         fprintf(stderr, "Error initializing RTR manager.");
         return 0;
     }
@@ -297,21 +268,20 @@ struct rtr_mgr_config *rtr_tcp_connect(
     const char *host, const char *port, const char *bindaddr,
     const pfx_update_fp callback
 ) {
-    // Create RTR manager config with the single server group.
-    struct rtr_mgr_config *result = rtr_create_mgr_config(
-        rtr_create_mgr_group(
-            rtr_create_rtr_socket(
-                rtr_create_tcp_socket(
-                    rtr_create_tcp_config(host, port, bindaddr)
-                )
-            ),
-            1
+    // Prepare pointer to result config.
+    struct rtr_mgr_config *result;
+
+    // Create the single server group.
+    struct rtr_mgr_group *group = rtr_create_mgr_group(
+        rtr_create_rtr_socket(
+            rtr_create_tcp_socket(rtr_create_tcp_config(host, port, bindaddr))
         ),
         1
     );
 
     // Initialize RTR manager and bail out on error.
-    if (rtr_mgr_init(result, 240, 520, callback) == RTR_ERROR) {
+    result = rtr_mgr_init(group, 1, 240, 520, callback, 0, 0);
+    if (!result) {
         fprintf(stderr, "Error initializing RTR manager.");
         return 0;
     }

rtr.h

@@ -38,15 +38,12 @@
  * @param privkey_file path to a file containing the private key to be used for
  * authentication with the SSH server. If set to a null pointer, the user's
  * default identity is used.
- * @param pubkey_file path to a file containing the public key to be used for
- * authentication with the SSH server. If set to a null pointer, the user's
- * default public key is used.
  * @param callback callback function for RTR updates.
  * @return
  */
 struct rtr_mgr_config *rtr_ssh_connect(
     const char *, const char *, const char *, const char *, const char *,
-    const char *, const char *, const pfx_update_fp
+    const char *, const pfx_update_fp
 );
 
 /**