Harald Welte has submitted this change and it was merged.
Change subject: VIRT-PHY: osmo_mcast_sock: Get rid of server_sock.sock_conf
......................................................................
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
---
M src/host/virt_phy/include/virtphy/osmo_mcast_sock.h
M src/host/virt_phy/src/shared/osmo_mcast_sock.c
2 files changed, 1 insertion(+), 10 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/virt_phy/include/virtphy/osmo_mcast_sock.h
b/src/host/virt_phy/include/virtphy/osmo_mcast_sock.h
index f318ffe..abf2c48 100644
--- a/src/host/virt_phy/include/virtphy/osmo_mcast_sock.h
+++ b/src/host/virt_phy/include/virtphy/osmo_mcast_sock.h
@@ -5,7 +5,6 @@
struct mcast_server_sock {
struct osmo_fd *osmo_fd;
- struct sockaddr_in *sock_conf;
};
struct mcast_client_sock {
diff --git a/src/host/virt_phy/src/shared/osmo_mcast_sock.c
b/src/host/virt_phy/src/shared/osmo_mcast_sock.c
index b9bf90c..fdbbb88 100644
--- a/src/host/virt_phy/src/shared/osmo_mcast_sock.c
+++ b/src/host/virt_phy/src/shared/osmo_mcast_sock.c
@@ -21,7 +21,6 @@
/* 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,
@@ -30,11 +29,6 @@
perror("Failed to create Multicast Server Socket");
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
*/
@@ -131,8 +125,7 @@
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_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);
}
--
To view, visit https://gerrit.osmocom.org/3231
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c98653c41eff9feb649d9c47cd40b26fd81ed05
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder
