osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
14
0
Fork 1
Code Issues Releases Wiki Activity

CTRL: Ensure peer/connection info is always printed the same way 

Now that we use osmo_sock_get_name() to print connection information
at disconnect, let's use the same also at accept() time.

Furthermore, let's call it CTRL connection everywhere for consistency.

Change-Id: I33ee7d0ed853c5b2a4ae4e8ef945f8f27753cdea
This commit is contained in:
Harald Welte 2017-12-22 18:03:44 +01:00
parent 29e2798ec5
commit 5995281fd6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ctrl/control_if.c
View File

@ -429,7 +429,7 @@ static int control_write_cb(struct osmo_fd *bfd, struct msgb *msg)
if (rc == 0)
control_close_conn(ccon);
else if (rc != msg->len)
LOGP(DLCTRL, LOGL_ERROR, "Failed to write message to the control connection.\n");
LOGP(DLCTRL, LOGL_ERROR, "Failed to write message to the CTRL connection.\n");
return rc;
}
@ -464,20 +464,17 @@ static int listen_fd_cb(struct osmo_fd *listen_bfd, unsigned int what)
int ret, fd, on;
struct ctrl_handle *ctrl;
struct ctrl_connection *ccon;
struct sockaddr_in sa;
socklen_t sa_len = sizeof(sa);
char *name;
if (!(what & BSC_FD_READ))
return 0;
fd = accept(listen_bfd->fd, (struct sockaddr *) &sa, &sa_len);
fd = accept(listen_bfd->fd, NULL, NULL);
if (fd < 0) {
perror("accept");
return fd;
}
LOGP(DLCTRL, LOGL_INFO, "accept()ed new control connection from %s\n",
inet_ntoa(sa.sin_addr));
#ifdef TCP_NODELAY
on = 1;
@ -496,6 +493,9 @@ static int listen_fd_cb(struct osmo_fd *listen_bfd, unsigned int what)
return -1;
}
name = osmo_sock_get_name(ccon, fd);
LOGP(DLCTRL, LOGL_INFO, "accept()ed new CTRL connection from %s\n", name);
ccon->write_queue.bfd.fd = fd;
ccon->write_queue.bfd.when = BSC_FD_READ;