Functioning source IP address support. Blocked by rtrlib/rtrlib#20. #4

Author: mceyran

bird-rtrlib-cli.c

@@ -222,14 +222,16 @@ int main(int argc, char *argv[]) {
     switch (config.rtr_connection_type) {
         case tcp:
             rtr_config = rtr_tcp_connect(
-                config.rtr_host, config.rtr_port, &rtr_callback
+                config.rtr_host, config.rtr_port, config.rtr_bind_addr,
+                &rtr_callback
             );
             break;
         case ssh:
             rtr_config = rtr_ssh_connect(
-                config.rtr_host, config.rtr_port, config.rtr_ssh_hostkey_file,
-                config.rtr_ssh_username, config.rtr_ssh_privkey_file,
-                config.rtr_ssh_pubkey_file, &rtr_callback
+                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
             );
             break;
     }

rtr.c

@@ -115,6 +115,7 @@ static struct rtr_socket *rtr_create_rtr_socket(struct tr_socket *socket) {
 static struct tr_ssh_config *rtr_create_ssh_config(
     const char *host,
     const unsigned int port,
+    const char *bindaddr,
     const char *server_hostkey_path,
     const char *username,
     const char *client_privkey_path,
@@ -129,6 +130,10 @@ static struct tr_ssh_config *rtr_create_ssh_config(
     result->port = port;
     result->username = strdup(username);
 
+    // Assign bind address if available.
+    if (bindaddr)
+        result->bindaddr = strdup(bindaddr);
+
     // Assign key paths (optional).
     if (server_hostkey_path)
         result->server_hostkey_path = strdup(server_hostkey_path);
@@ -173,7 +178,7 @@ static struct tr_socket *rtr_create_ssh_socket(
  * @return
  */
 static struct tr_tcp_config *rtr_create_tcp_config(
-    const char *host, const char *port
+    const char *host, const char *port, const char *bindaddr
 ) {
     // Initialize result.
     struct tr_tcp_config *result = malloc(sizeof (struct tr_tcp_config));
@@ -182,6 +187,7 @@ static struct tr_tcp_config *rtr_create_tcp_config(
     // Populate result.
     result->host = strdup(host);
     result->port = strdup(port);
+    result->bindaddr = strdup(bindaddr);
 
     // Store result in static variable until RTRLIB copies and frees the config.
     tcp_config = result;
@@ -248,9 +254,9 @@ 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 *hostkey_file,
-    const char *username, const char *privkey_file, const char *pubkey_file,
-    const pfx_update_fp callback
+    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
 ) {
     // Create RTR manager config with the single server group.
     struct rtr_mgr_config *result = rtr_create_mgr_config(
@@ -259,6 +265,7 @@ struct rtr_mgr_config *rtr_ssh_connect(
                 rtr_create_ssh_socket(rtr_create_ssh_config(
                     host,
                     strtoul(port, 0, 10),
+                    bindaddr,
                     hostkey_file,
                     username,
                     privkey_file,
@@ -287,13 +294,16 @@ struct rtr_mgr_config *rtr_ssh_connect(
 }
 
 struct rtr_mgr_config *rtr_tcp_connect(
-    const char *host, const char *port, const pfx_update_fp callback
+    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))
+                rtr_create_tcp_socket(
+                    rtr_create_tcp_config(host, port, bindaddr)
+                )
             ),
             1
         ),

rtr.h

@@ -30,6 +30,8 @@
  * Returns a null pointer on error.
  * @param host host name of the SSH server.
  * @param port port number of the SSH server in string representation.
+ * @param bindaddr host name or IP address the RTR connection shall be made from
+ * (null pointer for any).
  * @param hostkey_file path to a file containing the host key of the specified
  * server. If set to a null pointer, the default known_hosts file is used.
  * @param username name of the user to be authenticated with the SSH server.
@@ -39,25 +41,26 @@
  * @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
+ * @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 pfx_update_fp
+    const char *, const char *, const pfx_update_fp
 );
 
 /**
- * Connects to the RTR server at the specified address and port with plain TCP
- * using the specified callback function for RTR updates and returns the
+ * Connects to the RTR server with the specified parameters and returns the
  * corresponding `rtr_mgr_config` structure. Returns a null pointer on error.
- * @param host
- * @param port
- * @param callback
+ * @param host host name of the TCP server.
+ * @param port port number of the TCP server in string representation.
+ * @param bindaddr host name or IP address the RTR connection shall be made from
+ * (null pointer for any).
+ * @param callback callback function for RTR updates.
  * @return
  */
 struct rtr_mgr_config *rtr_tcp_connect(
-    const char *, const char *, const pfx_update_fp
+    const char *, const char *, const char *, const pfx_update_fp
 );
 
 /**