aboutsummaryrefslogtreecommitdiff
path: root/src/socket.c
diff options
context:
space:
mode:
authorBrett Nash <nash@nash.space>2022-02-10 11:14:13 -0800
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2022-02-11 00:17:08 +0100
commit2d133fbda01ce463b561a3de7a0a3ebf11391668 (patch)
treeb4a488b3431a4884f1614ffd227864afd7dc9028 /src/socket.c
parent88e2f8e385614432d8499a4fb37f0d361cca30d6 (diff)
downloadslirp-2d133fbda01ce463b561a3de7a0a3ebf11391668.zip
slirp-2d133fbda01ce463b561a3de7a0a3ebf11391668.tar.gz
slirp-2d133fbda01ce463b561a3de7a0a3ebf11391668.tar.bz2
Rename insque/remque -> slirp_[ins|rem]que
Avoid a macro translation when not needed, and potentially doing really weird things to headers.
Diffstat (limited to 'src/socket.c')
-rw-r--r--src/socket.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/socket.c b/src/socket.c
index f7af028..b70d727 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -41,7 +41,7 @@ struct socket *solookup(struct socket **last, struct socket *head,
/*
* Create a new socket, initialise the fields
* It is the responsibility of the caller to
- * insque() it into the correct linked-list
+ * slirp_insque() it into the correct linked-list
*/
struct socket *socreate(Slirp *slirp, int type)
{
@@ -61,11 +61,11 @@ struct socket *socreate(Slirp *slirp, int type)
/*
* Remove references to so from the given message queue.
*/
-static void soqfree(struct socket *so, struct quehead *qh)
+static void soqfree(struct socket *so, struct slirp_quehead *qh)
{
struct mbuf *ifq;
- for (ifq = (struct mbuf *)qh->qh_link; (struct quehead *)ifq != qh;
+ for (ifq = (struct mbuf *)qh->qh_link; (struct slirp_quehead *)ifq != qh;
ifq = ifq->ifq_next) {
if (ifq->ifq_so == so) {
struct mbuf *ifm;
@@ -78,7 +78,7 @@ static void soqfree(struct socket *so, struct quehead *qh)
}
/*
- * remque and free a socket, clobber cache
+ * slirp_remque and free a socket, clobber cache
*/
void sofree(struct socket *so)
{
@@ -101,7 +101,7 @@ void sofree(struct socket *so)
m_free(so->so_m);
if (so->so_next && so->so_prev)
- remque(so); /* crashes if so is not in a queue */
+ slirp_remque(so); /* crashes if so is not in a queue */
if (so->so_tcpcb) {
g_free(so->so_tcpcb);
@@ -823,7 +823,7 @@ struct socket *tcpx_listen(Slirp *slirp,
/* Don't tcp_attach... we don't need so_snd nor so_rcv */
so->so_tcpcb = tcp_newtcpcb(so);
- insque(so, &slirp->tcb);
+ slirp_insque(so, &slirp->tcb);
/*
* SS_FACCEPTONCE sockets must time out.