src: use namespace prefix osmo_fd* and osmo_select*
Summary of changes:
s/struct bsc_fd/struct osmo_fd/g
s/bsc_register_fd/osmo_fd_register/g
s/bsc_unregister_fd/osmo_fd_unregister/g
s/bsc_select_main/osmo_select_main/g
diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h
index 7d8c37e..73911bc 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -275,7 +275,7 @@
regex_t ussd_query_re;
char *ussd_token;
char *ussd_local;
- struct bsc_fd ussd_listen;
+ struct osmo_fd ussd_listen;
struct bsc_nat_ussd_con *ussd_con;
/* for maintainenance */
@@ -363,7 +363,7 @@
int bsc_write(struct bsc_connection *bsc, struct msgb *msg, int id);
int bsc_do_write(struct write_queue *queue, struct msgb *msg, int id);
int bsc_write_msg(struct write_queue *queue, struct msgb *msg);
-int bsc_write_cb(struct bsc_fd *bfd, struct msgb *msg);
+int bsc_write_cb(struct osmo_fd *bfd, struct msgb *msg);
/* IMSI allow/deny handling */
int bsc_parse_reg(void *ctx, regex_t *reg, char **imsi, int argc, const char **argv) __attribute__ ((warn_unused_result));
diff --git a/openbsc/include/openbsc/e1_input.h b/openbsc/include/openbsc/e1_input.h
index cd8abca..0eae5d9 100644
--- a/openbsc/include/openbsc/e1_input.h
+++ b/openbsc/include/openbsc/e1_input.h
@@ -81,15 +81,15 @@
union {
struct {
/* mISDN driver has one fd for each ts */
- struct bsc_fd fd;
+ struct osmo_fd fd;
} misdn;
struct {
/* ip.access driver has one fd for each ts */
- struct bsc_fd fd;
+ struct osmo_fd fd;
} ipaccess;
struct {
/* DAHDI driver has one fd for each ts */
- struct bsc_fd fd;
+ struct osmo_fd fd;
struct lapd_instance *lapd;
} dahdi;
} driver;
diff --git a/openbsc/include/openbsc/gprs_ns.h b/openbsc/include/openbsc/gprs_ns.h
index f497e23..8f28d46 100644
--- a/openbsc/include/openbsc/gprs_ns.h
+++ b/openbsc/include/openbsc/gprs_ns.h
@@ -133,13 +133,13 @@
/* NS-over-IP specific bits */
struct {
- struct bsc_fd fd;
+ struct osmo_fd fd;
uint32_t local_ip;
uint16_t local_port;
} nsip;
/* NS-over-FR-over-GRE-over-IP specific bits */
struct {
- struct bsc_fd fd;
+ struct osmo_fd fd;
uint32_t local_ip;
int enabled:1;
} frgre;
diff --git a/openbsc/include/openbsc/ipaccess.h b/openbsc/include/openbsc/ipaccess.h
index 388ad64..8d30327 100644
--- a/openbsc/include/openbsc/ipaccess.h
+++ b/openbsc/include/openbsc/ipaccess.h
@@ -85,8 +85,8 @@
/*
* methods for parsing and sending a message
*/
-int ipaccess_rcvmsg_base(struct msgb *msg, struct bsc_fd *bfd);
-struct msgb *ipaccess_read_msg(struct bsc_fd *bfd, int *error);
+int ipaccess_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd);
+struct msgb *ipaccess_read_msg(struct osmo_fd *bfd, int *error);
void ipaccess_prepend_header(struct msgb *msg, int proto);
void ipaccess_prepend_header_ext(struct msgb *msg, int proto);
int ipaccess_send_pong(int fd);
diff --git a/openbsc/include/openbsc/mgcp_internal.h b/openbsc/include/openbsc/mgcp_internal.h
index 0214318..a9d5149 100644
--- a/openbsc/include/openbsc/mgcp_internal.h
+++ b/openbsc/include/openbsc/mgcp_internal.h
@@ -66,8 +66,8 @@
/*
* Each end has a socket...
*/
- struct bsc_fd rtp;
- struct bsc_fd rtcp;
+ struct osmo_fd rtp;
+ struct osmo_fd rtcp;
int local_port;
int local_alloc;
diff --git a/openbsc/include/openbsc/osmo_bsc_rf.h b/openbsc/include/openbsc/osmo_bsc_rf.h
index f1ff9ba..dbbb3db 100644
--- a/openbsc/include/openbsc/osmo_bsc_rf.h
+++ b/openbsc/include/openbsc/osmo_bsc_rf.h
@@ -9,7 +9,7 @@
struct osmo_bsc_rf {
/* the value of signal.h */
int policy;
- struct bsc_fd listen;
+ struct osmo_fd listen;
struct gsm_network *gsm_network;
const char *last_state_command;
diff --git a/openbsc/include/openbsc/rtp_proxy.h b/openbsc/include/openbsc/rtp_proxy.h
index 8ad3636..3b208c3 100644
--- a/openbsc/include/openbsc/rtp_proxy.h
+++ b/openbsc/include/openbsc/rtp_proxy.h
@@ -48,7 +48,7 @@
struct sockaddr_in sin_local;
struct sockaddr_in sin_remote;
- struct bsc_fd bfd;
+ struct osmo_fd bfd;
/* linked list of to-be-transmitted msgb's */
struct llist_head tx_queue;
};
diff --git a/openbsc/include/openbsc/sgsn.h b/openbsc/include/openbsc/sgsn.h
index 00e1ec3..7456614 100644
--- a/openbsc/include/openbsc/sgsn.h
+++ b/openbsc/include/openbsc/sgsn.h
@@ -21,9 +21,9 @@
char *config_file;
struct sgsn_config cfg;
/* File descriptor wrappers for LibGTP */
- struct bsc_fd gtp_fd0;
- struct bsc_fd gtp_fd1c;
- struct bsc_fd gtp_fd1u;
+ struct osmo_fd gtp_fd0;
+ struct osmo_fd gtp_fd1c;
+ struct osmo_fd gtp_fd1u;
/* Timer for libGTP */
struct osmo_timer_list gtp_timer;
/* GSN instance for libgtp */
diff --git a/openbsc/include/openbsc/socket.h b/openbsc/include/openbsc/socket.h
index 87ef37f..0fd85f1 100644
--- a/openbsc/include/openbsc/socket.h
+++ b/openbsc/include/openbsc/socket.h
@@ -7,8 +7,8 @@
#define IPPROTO_GRE 47
#endif
-int make_sock(struct bsc_fd *bfd, int proto,
+int make_sock(struct osmo_fd *bfd, int proto,
uint32_t ip, uint16_t port, int priv_nr,
- int (*cb)(struct bsc_fd *fd, unsigned int what), void *data);
+ int (*cb)(struct osmo_fd *fd, unsigned int what), void *data);
#endif /* _BSC_SOCKET_H */