diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2012-08-15 20:10:32 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2012-08-15 20:16:09 +0200 |
commit | ad2e9d637e27a6c51fa6f4ae8ec81075a6448c27 (patch) | |
tree | 3279404a3cbc23e345bc8a8b8c71f6017d14682b /examples | |
parent | 4fd56b6d2f40c57ecc68addee2e690c359c212c7 (diff) |
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
Diffstat (limited to 'examples')
-rw-r--r-- | examples/lapd-over-datagram-network.c | 24 | ||||
-rw-r--r-- | examples/lapd-over-datagram-user.c | 22 | ||||
-rw-r--r-- | examples/rtp-udp-test-client.c | 26 | ||||
-rw-r--r-- | examples/rtp-udp-test-server.c | 26 |
4 files changed, 49 insertions, 49 deletions
diff --git a/examples/lapd-over-datagram-network.c b/examples/lapd-over-datagram-network.c index fb94515..74bba74 100644 --- a/examples/lapd-over-datagram-network.c +++ b/examples/lapd-over-datagram-network.c @@ -33,7 +33,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; @@ -44,7 +44,7 @@ void sighandler(int foo) exit(EXIT_SUCCESS); } -int read_cb(struct osmo_dgram_conn *conn) +int read_cb(struct osmo_dgram *conn) { int error; struct msgb *msg; @@ -56,7 +56,7 @@ 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) { LOGP(DLAPDTEST, LOGL_ERROR, "cannot receive message\n"); return -1; } @@ -70,10 +70,10 @@ int read_cb(struct osmo_dgram_conn *conn) void lapd_tx_cb(struct msgb *msg, void *cbdata) { - struct osmo_dgram_conn *conn = cbdata; + struct osmo_dgram *conn = cbdata; LOGP(DLAPDTEST, 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, @@ -140,16 +140,16 @@ int main(int argc, char *argv[]) * initialize datagram server. */ - 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, 10001); - osmo_dgram_conn_set_remote_addr(conn, "127.0.0.1"); - osmo_dgram_conn_set_remote_port(conn, 10000); - 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, 10001); + osmo_dgram_set_remote_addr(conn, "127.0.0.1"); + osmo_dgram_set_remote_port(conn, 10000); + osmo_dgram_set_read_cb(conn, read_cb); lapd = lapd_instance_alloc(1, lapd_tx_cb, conn, lapd_rx_cb, conn, &lapd_profile_sat); @@ -164,7 +164,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (osmo_dgram_conn_open(conn) < 0) { + if (osmo_dgram_open(conn) < 0) { fprintf(stderr, "cannot open client\n"); exit(EXIT_FAILURE); } 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); } diff --git a/examples/rtp-udp-test-client.c b/examples/rtp-udp-test-client.c index 97ec6ff..78802b1 100644 --- a/examples/rtp-udp-test-client.c +++ b/examples/rtp-udp-test-client.c @@ -33,10 +33,10 @@ const struct log_info rtp_test_log_info = { .num_cat = ARRAY_SIZE(rtp_test_cat), }; -static struct osmo_dgram_conn *conn; +static struct osmo_dgram *conn; static struct osmo_rtp_handle *rtp; -static int read_cb(struct osmo_dgram_conn *conn) +static int read_cb(struct osmo_dgram *conn) { struct msgb *msg; struct rtp_hdr *rtph; @@ -48,7 +48,7 @@ static int read_cb(struct osmo_dgram_conn *conn) LOGP(DRTP_TEST, 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(DRTP_TEST, LOGL_ERROR, "cannot receive message\n"); return -1; @@ -71,8 +71,8 @@ static int read_cb(struct osmo_dgram_conn *conn) void sighandler(int foo) { LOGP(DLINP, LOGL_NOTICE, "closing RTP.\n"); - osmo_dgram_conn_close(conn); - osmo_dgram_conn_destroy(conn); + osmo_dgram_close(conn); + osmo_dgram_destroy(conn); osmo_rtp_handle_free(rtp); exit(EXIT_SUCCESS); } @@ -107,18 +107,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, 20001); - osmo_dgram_conn_set_remote_addr(conn, "127.0.0.1"); - osmo_dgram_conn_set_remote_port(conn, 20000); - 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, 20001); + osmo_dgram_set_remote_addr(conn, "127.0.0.1"); + osmo_dgram_set_remote_port(conn, 20000); + 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); } @@ -133,7 +133,7 @@ int main(int argc, char *argv[]) LOGP(DLINP, LOGL_ERROR, "OOM\n"); continue; } - osmo_dgram_conn_send(conn, msg); + osmo_dgram_send(conn, msg); } LOGP(DLINP, LOGL_NOTICE, "Entering main loop\n"); diff --git a/examples/rtp-udp-test-server.c b/examples/rtp-udp-test-server.c index 2f7f291..7d56d44 100644 --- a/examples/rtp-udp-test-server.c +++ b/examples/rtp-udp-test-server.c @@ -31,10 +31,10 @@ const struct log_info rtp_test_log_info = { .num_cat = ARRAY_SIZE(rtp_test_cat), }; -static struct osmo_dgram_conn *conn; +static struct osmo_dgram *conn; static struct osmo_rtp_handle *rtp; -int read_cb(struct osmo_dgram_conn *conn) +int read_cb(struct osmo_dgram *conn) { struct msgb *msg; char dummy_data[RTP_PT_GSM_FULL_PAYLOAD_LEN] = "payload test"; @@ -47,7 +47,7 @@ int read_cb(struct osmo_dgram_conn *conn) LOGP(DRTP_TEST, LOGL_ERROR, "cannot allocate message\n"); return -1; } - if (osmo_dgram_conn_recv(conn, msg) < 0) { + if (osmo_dgram_recv(conn, msg) < 0) { LOGP(DRTP_TEST, LOGL_ERROR, "cannot receive message\n"); return -1; } @@ -80,7 +80,7 @@ int read_cb(struct osmo_dgram_conn *conn) LOGP(DLINP, LOGL_ERROR, "OOM\n"); return -1; } - osmo_dgram_conn_send(conn, msg); + osmo_dgram_send(conn, msg); return 0; } @@ -88,8 +88,8 @@ int read_cb(struct osmo_dgram_conn *conn) void sighandler(int foo) { LOGP(DLINP, LOGL_NOTICE, "closing RTP.\n"); - osmo_dgram_conn_close(conn); - osmo_dgram_conn_destroy(conn); + osmo_dgram_close(conn); + osmo_dgram_destroy(conn); osmo_rtp_handle_free(rtp); exit(EXIT_SUCCESS); } @@ -121,18 +121,18 @@ int main(int argc, char *argv[]) * initialize datagram server. */ - conn = osmo_dgram_conn_create(tall_test); + conn = osmo_dgram_create(tall_test); if (conn == NULL) { LOGP(DRTP_TEST, LOGL_ERROR, "cannot create UDP socket\n"); exit(EXIT_FAILURE); } - osmo_dgram_conn_set_local_addr(conn, "127.0.0.1"); - osmo_dgram_conn_set_local_port(conn, 20000); - osmo_dgram_conn_set_remote_addr(conn, "127.0.0.1"); - osmo_dgram_conn_set_remote_port(conn, 20001); - 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, 20000); + osmo_dgram_set_remote_addr(conn, "127.0.0.1"); + osmo_dgram_set_remote_port(conn, 20001); + 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); } |