mirror of https://gerrit.osmocom.org/libosmocore
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
This commit is contained in:
parent
2b15952a37
commit
bfadfb771d
|
@ -133,13 +133,13 @@ struct gprs_ns_inst {
|
|||
|
||||
/* 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;
|
||||
|
|
|
@ -858,7 +858,7 @@ void gprs_ns_destroy(struct gprs_ns_inst *nsi)
|
|||
* We don't support Size Procedure, Configuration Procedure, ChangeWeight Procedure */
|
||||
|
||||
/* Read a single NS-over-IP message */
|
||||
static struct msgb *read_nsip_msg(struct bsc_fd *bfd, int *error,
|
||||
static struct msgb *read_nsip_msg(struct osmo_fd *bfd, int *error,
|
||||
struct sockaddr_in *saddr)
|
||||
{
|
||||
struct msgb *msg = gprs_ns_msgb_alloc();
|
||||
|
@ -890,7 +890,7 @@ static struct msgb *read_nsip_msg(struct bsc_fd *bfd, int *error,
|
|||
return msg;
|
||||
}
|
||||
|
||||
static int handle_nsip_read(struct bsc_fd *bfd)
|
||||
static int handle_nsip_read(struct osmo_fd *bfd)
|
||||
{
|
||||
int error;
|
||||
struct sockaddr_in saddr;
|
||||
|
@ -907,7 +907,7 @@ static int handle_nsip_read(struct bsc_fd *bfd)
|
|||
return error;
|
||||
}
|
||||
|
||||
static int handle_nsip_write(struct bsc_fd *bfd)
|
||||
static int handle_nsip_write(struct osmo_fd *bfd)
|
||||
{
|
||||
/* FIXME: actually send the data here instead of nsip_sendmsg() */
|
||||
return -EIO;
|
||||
|
@ -928,7 +928,7 @@ static int nsip_sendmsg(struct gprs_nsvc *nsvc, struct msgb *msg)
|
|||
}
|
||||
|
||||
/* UDP Port 23000 carries the LLC-in-BSSGP-in-NS protocol stack */
|
||||
static int nsip_fd_cb(struct bsc_fd *bfd, unsigned int what)
|
||||
static int nsip_fd_cb(struct osmo_fd *bfd, unsigned int what)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ struct gre_hdr {
|
|||
} __attribute__ ((packed));
|
||||
|
||||
/* IPv4 messages inside the GRE tunnel might be GRE keepalives */
|
||||
static int handle_rx_gre_ipv4(struct bsc_fd *bfd, struct msgb *msg,
|
||||
static int handle_rx_gre_ipv4(struct osmo_fd *bfd, struct msgb *msg,
|
||||
struct iphdr *iph, struct gre_hdr *greh)
|
||||
{
|
||||
struct gprs_ns_inst *nsi = bfd->data;
|
||||
|
@ -101,7 +101,7 @@ static int handle_rx_gre_ipv4(struct bsc_fd *bfd, struct msgb *msg,
|
|||
(struct sockaddr *)&daddr, sizeof(daddr));
|
||||
}
|
||||
|
||||
static struct msgb *read_nsfrgre_msg(struct bsc_fd *bfd, int *error,
|
||||
static struct msgb *read_nsfrgre_msg(struct osmo_fd *bfd, int *error,
|
||||
struct sockaddr_in *saddr)
|
||||
{
|
||||
struct msgb *msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR/GRE Rx");
|
||||
|
@ -203,7 +203,7 @@ out_err:
|
|||
int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg,
|
||||
struct sockaddr_in *saddr, enum gprs_ns_ll ll);
|
||||
|
||||
static int handle_nsfrgre_read(struct bsc_fd *bfd)
|
||||
static int handle_nsfrgre_read(struct osmo_fd *bfd)
|
||||
{
|
||||
int rc;
|
||||
struct sockaddr_in saddr;
|
||||
|
@ -230,7 +230,7 @@ out:
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int handle_nsfrgre_write(struct bsc_fd *bfd)
|
||||
static int handle_nsfrgre_write(struct osmo_fd *bfd)
|
||||
{
|
||||
/* FIXME: actually send the data here instead of nsip_sendmsg() */
|
||||
return -EIO;
|
||||
|
@ -268,7 +268,7 @@ int gprs_ns_frgre_sendmsg(struct gprs_nsvc *nsvc, struct msgb *msg)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int nsfrgre_fd_cb(struct bsc_fd *bfd, unsigned int what)
|
||||
static int nsfrgre_fd_cb(struct osmo_fd *bfd, unsigned int what)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue