diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-09-08 12:47:06 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-09-09 02:35:32 +0200 |
commit | 00af7723394abf4f03f7d209f5a128263fd7a32f (patch) | |
tree | 9293d2bd9b29a94db03c7849b432cb577669e093 /src/input | |
parent | 65a50893d5f9577c17dc4485d585c12d349c8e30 (diff) |
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.
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/hsl.c | 2 | ||||
-rw-r--r-- | src/input/ipa.c | 8 | ||||
-rw-r--r-- | src/input/ipaccess.c | 4 |
3 files changed, 5 insertions, 9 deletions
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 @@ static int hsl_line_update(struct e1inp_line *line) 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, 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 int ipa_client_fd_cb(struct osmo_fd *ofd, unsigned int what) 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 @@ ipa_client_link_create(void *ctx, struct e1inp_ts *ts, const char *driver_name, 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); 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 @@ static int ipaccess_line_update(struct e1inp_line *line) 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 @@ static int ipaccess_line_update(struct e1inp_line *line) } 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, |