diff options
| author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-09-08 13:29:06 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-09-09 02:35:45 +0200 |
| commit | 8ad30c96d4690af1e539b3e391d4f8ff23f85d80 (patch) | |
| tree | 792d3fa8de89cfa21655b61aa46ae3151a7a2685 /src | |
| parent | 8fc277b77765d8cdff0c08e5581bc8621a192d33 (diff) | |
ipa: use default write callback in ipa_client_conn_create if not specified
If no write callback is specified, use the default write callback.
Thus, we don't need to export ipa_client_write_default_cb.
No clients of this function outside libosmo-abis, so no breakages should
be expected.
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/ipa.c | 6 | ||||
| -rw-r--r-- | src/ipa_proxy.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/input/ipa.c b/src/input/ipa.c index 020a730..774d578 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -139,7 +139,7 @@ static void ipa_client_write(struct ipa_client_conn *link) link->write_cb(link); } -int ipa_client_write_default_cb(struct ipa_client_conn *link) +static int ipa_client_write_default_cb(struct ipa_client_conn *link) { struct osmo_fd *ofd = link->ofd; struct msgb *msg; @@ -244,7 +244,9 @@ ipa_client_conn_create(void *ctx, struct e1inp_ts *ts, ipa_link->port = port; ipa_link->connect_cb = connect_cb; ipa_link->read_cb = read_cb; - ipa_link->write_cb = write_cb; + /* default to generic write callback if not set. */ + if (write_cb == NULL) + ipa_link->write_cb = ipa_client_write_default_cb; ipa_link->line = ts->line; ipa_link->data = data; INIT_LLIST_HEAD(&ipa_link->tx_queue); diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c index 6f2525a..f4e1df8 100644 --- a/src/ipa_proxy.c +++ b/src/ipa_proxy.c @@ -190,7 +190,7 @@ ipa_sock_src_accept_cb(struct ipa_server_link *link, int fd) route->shared->dst.inst->net.port, NULL, ipa_sock_dst_cb, - ipa_client_write_default_cb, + NULL, conn); if (conn->dst == NULL) { LOGP(DLINP, LOGL_ERROR, "could not create client: %s\n", |