phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

VIRT-PHY: osmo_mcast_sock: Get rid of server_sock.sock_conf 

We don't need to store this data, we cans simply connect the socket to
the destination mcast address instead.

Change-Id: I3c98653c41eff9feb649d9c47cd40b26fd81ed05
This commit is contained in:
Harald Welte 2017-07-13 13:49:37 +02:00
parent 46a4524126
commit a2f06f28e2
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/host/virt_phy/include/virtphy/osmo_mcast_sock.h
View File

@ -5,7 +5,6 @@
struct mcast_server_sock {
struct osmo_fd *osmo_fd;
struct sockaddr_in *sock_conf;
};
struct mcast_client_sock {

10
src/host/virt_phy/src/shared/osmo_mcast_sock.c
View File

@ -21,7 +21,6 @@ mcast_server_sock_setup(void *ctx, char* tx_mcast_group, int tx_mcast_port, int
/* TODO: why allocate those dynamically ?!? */
serv_sock->osmo_fd = talloc_zero(serv_sock, struct osmo_fd);
serv_sock->sock_conf = talloc_zero(serv_sock, struct sockaddr_in);
/* setup mcast server socket */
rc = osmo_sock_init_ofd(serv_sock->osmo_fd, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
@ -31,11 +30,6 @@ mcast_server_sock_setup(void *ctx, char* tx_mcast_group, int tx_mcast_port, int
return NULL;
}
/* TODO: Why kleep this stored in sock_conf? */
serv_sock->sock_conf->sin_family = AF_INET;
serv_sock->sock_conf->sin_addr.s_addr = inet_addr(tx_mcast_group);
serv_sock->sock_conf->sin_port = htons(tx_mcast_port);
/* determines whether sent mcast packets should be looped back to the local sockets.
* loopback must be enabled if the mcast client is on the same machine */
if (setsockopt(serv_sock->osmo_fd->fd, IPPROTO_IP, IP_MULTICAST_LOOP,
@ -131,8 +125,7 @@ int mcast_client_sock_rx(struct mcast_client_sock *client_sock, void* buf,
int mcast_server_sock_tx(struct mcast_server_sock *serv_sock, void* data,
int data_len)
{
return sendto(serv_sock->osmo_fd->fd, data, data_len, 0,
(struct sockaddr *)serv_sock->sock_conf, sizeof(*serv_sock->sock_conf));
return send(serv_sock->osmo_fd->fd, data, data_len, 0);
}
int mcast_bidir_sock_tx(struct mcast_bidir_sock *bidir_sock, void* data,
@ -162,7 +155,6 @@ void mcast_client_sock_close(struct mcast_client_sock *client_sock)
void mcast_server_sock_close(struct mcast_server_sock *serv_sock)
{
close(serv_sock->osmo_fd->fd);
talloc_free(serv_sock->sock_conf);
talloc_free(serv_sock);
}