From 79844540a83d7acaf8166b3081913f1968ebf78c Mon Sep 17 00:00:00 2001
From: blmpl <blm@poczta.fm>
Date: Sat, 15 Oct 2016 10:10:52 +0200
Subject: Support binding to a specific network interface

Closes #597.
---
 contrib/config-example |  1 +
 contrib/pianobar.1     | 11 +++++++++++
 src/settings.c         |  3 +++
 src/settings.h         |  1 +
 src/ui.c               |  9 +++++++++
 5 files changed, 25 insertions(+)

diff --git a/contrib/config-example b/contrib/config-example
index 899ee39..070314b 100644
--- a/contrib/config-example
+++ b/contrib/config-example
@@ -10,6 +10,7 @@
 
 # Proxy (for those who are not living in the USA)
 #control_proxy = http://127.0.0.1:9090/
+#bind_to = if!tun0
 
 # Keybindings
 #act_help = ?
diff --git a/contrib/pianobar.1 b/contrib/pianobar.1
index 375ec47..4fc09c3 100644
--- a/contrib/pianobar.1
+++ b/contrib/pianobar.1
@@ -207,6 +207,17 @@ required to validate Pandora’s SSL certificate.
 Non-american users need a proxy to use pandora.com. Only the xmlrpc interface
 will use this proxy. The music is streamed directly.
 
+.TP
+.B bind_to = {if!tunX,host!x.x.x.x,..}
+This sets the interface name to use as outgoing network interface. The name can
+be an interface name, an IP address, or a host name. (from CURLOPT_INTERFACE)
+
+It can be used as a replacement for
+.B control_proxy
+in conjunction with OpenVPN's
+option
+.B route-nopull. 
+
 .TP
 .B decrypt_password = R=U!LH$O2B#
 
diff --git a/src/settings.c b/src/settings.c
index f1aa707..115a71c 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -111,6 +111,7 @@ void BarSettingsInit (BarSettings_t *settings) {
 void BarSettingsDestroy (BarSettings_t *settings) {
 	free (settings->controlProxy);
 	free (settings->proxy);
+	free (settings->bindTo);
 	free (settings->username);
 	free (settings->password);
 	free (settings->passwordCmd);
@@ -269,6 +270,8 @@ void BarSettingsRead (BarSettings_t *settings) {
 				settings->controlProxy = strdup (val);
 			} else if (streq ("proxy", key)) {
 				settings->proxy = strdup (val);
+			} else if (streq ("bind_to", key)) {
+				settings->bindTo = strdup (val);
 			} else if (streq ("user", key)) {
 				settings->username = strdup (val);
 			} else if (streq ("password", key)) {
diff --git a/src/settings.h b/src/settings.h
index d35a64c..0b40113 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -93,6 +93,7 @@ typedef struct {
 	char *password, *passwordCmd;
 	char *controlProxy; /* non-american listeners need this */
 	char *proxy;
+	char *bindTo;
 	char *autostartStation;
 	char *eventCmd;
 	char *loveIcon;
diff --git a/src/ui.c b/src/ui.c
index 5350dea..69bf9ee 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -209,6 +209,15 @@ static CURLcode BarPianoHttpRequest (CURL * const http,
 		setAndCheck (CURLOPT_CAINFO, settings->caBundle);
 	}
 
+	if (settings->bindTo!= NULL) {
+		if (curl_easy_setopt (http, CURLOPT_INTERFACE,
+				settings->bindTo) != CURLE_OK) {
+			/* if binding fails, notice about that */
+			BarUiMsg (settings, MSG_ERR, "bindTo (%s) is invalid!\n",
+					settings->bindTo);
+		}
+	}
+
 	/* set up proxy (control proxy for non-us citizen or global proxy for poor
 	 * firewalled fellows) */
 	if (settings->controlProxy != NULL) {
-- 
cgit v1.2.3