commit 00af7723394abf4f03f7d209f5a128263fd7a32f
author Pablo Neira Ayuso <pablo@gnumonks.org> Thu Sep 08 12:47:06 2011 +0200
committer Pablo Neira Ayuso <pablo@netfilter.org> Fri Sep 09 02:35:32 2011 +0200
tree 9293d2bd9b29a94db03c7849b432cb577669e093
parent 65a50893d5f9577c17dc4485d585c12d349c8e30

ipa: remove bogus driver_name parameter from ipa_client_create

This parameter is not required since the line that we pass as
parameter already has one driver attached.

src/input/hsl.c

diff --git a/src/input/hsl.c b/src/input/hsl.c
index 60eea17..040dbce 100644
--- a/src/input/hsl.c
+++ b/src/input/hsl.c
@@ -507,7 +507,7 @@
 
 		link = ipa_client_link_create(tall_hsl_ctx,
 					      &line->ts[E1INP_SIGN_OML-1],
-					      "hsl", E1INP_SIGN_OML,
+					      E1INP_SIGN_OML,
 					      line->ops->cfg.ipa.addr,
 					      HSL_TCP_PORT,
 					      hsl_bts_connect,

src/input/ipa.c

diff --git a/src/input/ipa.c b/src/input/ipa.c
index b9bde68..83863f5 100644
--- a/src/input/ipa.c
+++ b/src/input/ipa.c
@@ -205,7 +205,7 @@
 static void ipa_link_timer_cb(void *data);
 
 struct ipa_client_link *
-ipa_client_link_create(void *ctx, struct e1inp_ts *ts, const char *driver_name,
+ipa_client_link_create(void *ctx, struct e1inp_ts *ts,
 		       int priv_nr, const char *addr, uint16_t port,
 		       int (*connect_cb)(struct ipa_client_link *link),
 		       int (*read_cb)(struct ipa_client_link *link,
@@ -220,14 +220,10 @@
 		return NULL;
 
 	if (ts) {
-		struct e1inp_driver *driver;
-
-		driver = e1inp_driver_find(driver_name);
-		if (driver == NULL) {
+		if (ts->line->driver == NULL) {
 			talloc_free(ipa_link);
 			return NULL;
 		}
-		ts->line->driver = driver;
 		ipa_link->ofd = &ts->driver.ipaccess.fd;
 	} else {
 		ipa_link->ofd = talloc_zero(ctx, struct osmo_fd);

src/input/ipaccess.c

diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index ea04e8d..3163a8c 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -881,7 +881,7 @@
 
 		link = ipa_client_link_create(tall_ipa_ctx,
 					      &line->ts[E1INP_SIGN_OML-1],
-					      "ipa", E1INP_SIGN_OML,
+					      E1INP_SIGN_OML,
 					      line->ops->cfg.ipa.addr,
 					      IPA_TCP_PORT_OML,
 					      NULL,
@@ -902,7 +902,7 @@
 		}
 		rsl_link = ipa_client_link_create(tall_ipa_ctx,
 						  &line->ts[E1INP_SIGN_RSL-1],
-						  "ipa", E1INP_SIGN_RSL,
+						  E1INP_SIGN_RSL,
 						  line->ops->cfg.ipa.addr,
 						  IPA_TCP_PORT_RSL,
 						  NULL,

src/ipa_proxy.c

diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c
index 53da996..dadfd2f 100644
--- a/src/ipa_proxy.c
+++ b/src/ipa_proxy.c
@@ -185,7 +185,7 @@
 
 	LOGP(DLINP, LOGL_NOTICE, "now trying to connect to destination\n");
 
-	conn->dst = ipa_client_link_create(NULL, NULL, NULL, 0,
+	conn->dst = ipa_client_link_create(NULL, NULL, 0,
 					   route->shared->dst.inst->net.addr,
 					   route->shared->dst.inst->net.port,
 					   NULL,