From ad2e9d637e27a6c51fa6f4ae8ec81075a6448c27 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 15 Aug 2012 20:10:32 +0200 Subject: src: shorter names for datagram sockets %s/_conn_/_/g %s/_conn//g %s/_server_/_tx_/g %s/_client_/_rx_/g %s/_SERVER_/_TX_/g %s/_CLIENT_/_RX_/g %s/_RECONFIG/_RECONF/g --- examples/lapd-over-datagram-user.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/lapd-over-datagram-user.c') diff --git a/examples/lapd-over-datagram-user.c b/examples/lapd-over-datagram-user.c index 601d12c..e2fcdfb 100644 --- a/examples/lapd-over-datagram-user.c +++ b/examples/lapd-over-datagram-user.c @@ -43,7 +43,7 @@ const struct log_info lapd_test_log_info = { .num_cat = ARRAY_SIZE(lapd_test_cat), }; -static struct osmo_dgram_conn *conn; +static struct osmo_dgram *conn; static struct lapd_instance *lapd; static int sapi = 63, tei = 0; @@ -55,7 +55,7 @@ void sighandler(int foo) exit(EXIT_SUCCESS); } -static int read_cb(struct osmo_dgram_conn *conn) +static int read_cb(struct osmo_dgram *conn) { int error; struct msgb *msg; @@ -65,7 +65,7 @@ static int read_cb(struct osmo_dgram_conn *conn) LOGP(DLAPDTEST, LOGL_ERROR, "cannot allocate message\n"); return -1; } - if (osmo_dgram_conn_recv(conn, msg) < 0) { + if (osmo_dgram_recv(conn, msg) < 0) { msgb_free(msg); LOGP(DLAPDTEST, LOGL_ERROR, "cannot receive message\n"); return -1; @@ -83,7 +83,7 @@ static void *tall_test; void lapd_tx_cb(struct msgb *msg, void *cbdata) { LOGP(DLINP, LOGL_DEBUG, "sending message over datagram\n"); - osmo_dgram_conn_send(conn, msg); + osmo_dgram_send(conn, msg); } void lapd_rx_cb(struct osmo_dlsap_prim *dp, uint8_t tei, uint8_t sapi, @@ -212,18 +212,18 @@ int main(int argc, char *argv[]) * initialize datagram socket. */ - conn = osmo_dgram_conn_create(tall_test); + conn = osmo_dgram_create(tall_test); if (conn == NULL) { fprintf(stderr, "cannot create client\n"); exit(EXIT_FAILURE); } - osmo_dgram_conn_set_local_addr(conn, "127.0.0.1"); - osmo_dgram_conn_set_local_port(conn, 10000); - osmo_dgram_conn_set_remote_addr(conn, "127.0.0.1"); - osmo_dgram_conn_set_remote_port(conn, 10001); - osmo_dgram_conn_set_read_cb(conn, read_cb); + osmo_dgram_set_local_addr(conn, "127.0.0.1"); + osmo_dgram_set_local_port(conn, 10000); + osmo_dgram_set_remote_addr(conn, "127.0.0.1"); + osmo_dgram_set_remote_port(conn, 10001); + osmo_dgram_set_read_cb(conn, read_cb); - if (osmo_dgram_conn_open(conn) < 0) { + if (osmo_dgram_open(conn) < 0) { fprintf(stderr, "cannot open client\n"); exit(EXIT_FAILURE); } -- cgit v1.2.3