aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@gnumonks.org>2011-10-09 21:19:13 +0200
committerPablo Neira Ayuso <pablo@gnumonks.org>2011-10-09 21:35:51 +0200
commit2bd6adfd86f2dd88362e90701f9d347ececc83c6 (patch)
tree9bb460db04c98c929ea265b239fa5d9369a86d62
parentdae8f28374976f64ca29339717e4e6ce24e68f0f (diff)
stream: add *_get_data() function to obtain private data
Add new functions: osmo_stream_server_link_get_data osmo_stream_server_conn_get_data osmo_stream_client_conn_get_data To obtain private data from osmo_stream_* handlers. This patch also introduces missing osmo_stream_server_conn_set_data.
-rw-r--r--include/osmocom/netif/stream.h4
-rw-r--r--src/stream.c23
2 files changed, 27 insertions, 0 deletions
diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index ceace28..4363a67 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -9,6 +9,8 @@ void osmo_stream_server_link_destroy(struct osmo_stream_server_link *link);
void osmo_stream_server_link_set_addr(struct osmo_stream_server_link *link, const char *addr);
void osmo_stream_server_link_set_port(struct osmo_stream_server_link *link, uint16_t port);
void osmo_stream_server_link_set_accept_cb(struct osmo_stream_server_link *link, int (*accept_cb)(struct osmo_stream_server_link *link, int fd));
+void osmo_stream_server_link_set_data(struct osmo_stream_server_link *link, void *data);
+void *osmo_stream_server_link_get_data(struct osmo_stream_server_link *link);
int osmo_stream_server_link_open(struct osmo_stream_server_link *link);
void osmo_stream_server_link_close(struct osmo_stream_server_link *link);
@@ -16,6 +18,7 @@ void osmo_stream_server_link_close(struct osmo_stream_server_link *link);
struct osmo_stream_server_conn;
struct osmo_stream_server_conn *osmo_stream_server_conn_create(void *ctx, struct osmo_stream_server_link *link, int fd, int (*cb)(struct osmo_stream_server_conn *conn, struct msgb *msg), int (*closed_cb)(struct osmo_stream_server_conn *conn), void *data);
+void *osmo_stream_server_conn_get_data(struct osmo_stream_server_conn *conn);
void osmo_stream_server_conn_destroy(struct osmo_stream_server_conn *conn);
void osmo_stream_server_conn_send(struct osmo_stream_server_conn *conn, struct msgb *msg);
@@ -25,6 +28,7 @@ struct osmo_stream_client_conn;
void osmo_stream_client_conn_set_addr(struct osmo_stream_client_conn *link, const char *addr);
void osmo_stream_client_conn_set_port(struct osmo_stream_client_conn *link, uint16_t port);
void osmo_stream_client_conn_set_data(struct osmo_stream_client_conn *link, void *data);
+void *osmo_stream_client_conn_get_data(struct osmo_stream_client_conn *link);
void osmo_stream_client_conn_set_connect_cb(struct osmo_stream_client_conn *link, int (*connect_cb)(struct osmo_stream_client_conn *link));
void osmo_stream_client_conn_set_read_cb(struct osmo_stream_client_conn *link, int (*read_cb)(struct osmo_stream_client_conn *link, struct msgb *msgb));
diff --git a/src/stream.c b/src/stream.c
index 65d7f5a..bdb76ff 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -206,6 +206,11 @@ osmo_stream_client_conn_set_data(struct osmo_stream_client_conn *link,
link->flags |= OSMO_STREAM_CLIENT_F_RECONFIG;
}
+void *osmo_stream_client_conn_get_data(struct osmo_stream_client_conn *link)
+{
+ return link->data;
+}
+
void
osmo_stream_client_conn_set_connect_cb(struct osmo_stream_client_conn *link,
int (*connect_cb)(struct osmo_stream_client_conn *link))
@@ -341,6 +346,19 @@ void osmo_stream_server_link_set_port(struct osmo_stream_server_link *link,
link->flags |= OSMO_STREAM_SERVER_F_RECONFIG;
}
+void
+osmo_stream_server_link_set_data(struct osmo_stream_server_link *link,
+ void *data)
+{
+ link->data = data;
+ link->flags |= OSMO_STREAM_SERVER_F_RECONFIG;
+}
+
+void *osmo_stream_server_link_get_data(struct osmo_stream_server_link *link)
+{
+ return link->data;
+}
+
void osmo_stream_server_link_set_accept_cb(struct osmo_stream_server_link *link,
int (*accept_cb)(struct osmo_stream_server_link *link, int fd))
@@ -492,6 +510,11 @@ osmo_stream_server_conn_create(void *ctx, struct osmo_stream_server_link *link,
return conn;
}
+void *osmo_stream_server_conn_get_data(struct osmo_stream_server_conn *link)
+{
+ return link->data;
+}
+
void osmo_stream_server_conn_destroy(struct osmo_stream_server_conn *conn)
{
close(conn->ofd.fd);