projects
/
osmocom-bb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
misc: Put git-version-gen into the tarball
[osmocom-bb.git]
/
src
/
gsmtap_util.c
diff --git
a/src/gsmtap_util.c
b/src/gsmtap_util.c
index
3d20bfc
..
c8c26c6
100644
(file)
--- a/
src/gsmtap_util.c
+++ b/
src/gsmtap_util.c
@@
-124,7
+124,8
@@
int gsmtap_source_init_fd(const char *host, uint16_t port)
if (host == NULL)
host = "localhost";
if (host == NULL)
host = "localhost";
- return osmo_sock_init(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, host, port, 0);
+ return osmo_sock_init(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, host, port,
+ OSMO_SOCK_F_CONNECT);
}
int gsmtap_source_add_sink_fd(int gsmtap_fd)
}
int gsmtap_source_add_sink_fd(int gsmtap_fd)
@@
-138,7
+139,8
@@
int gsmtap_source_add_sink_fd(int gsmtap_fd)
return rc;
if (osmo_sockaddr_is_local((struct sockaddr *)&ss, ss_len) == 1) {
return rc;
if (osmo_sockaddr_is_local((struct sockaddr *)&ss, ss_len) == 1) {
- rc = osmo_sock_init_sa((struct sockaddr *)&ss, SOCK_DGRAM, IPPROTO_UDP, 1);
+ rc = osmo_sock_init_sa((struct sockaddr *)&ss, SOCK_DGRAM,
+ IPPROTO_UDP, OSMO_SOCK_F_BIND);
if (rc >= 0)
return rc;
}
if (rc >= 0)
return rc;
}
@@
-197,16
+199,13
@@
static int gsmtap_wq_w_cb(struct osmo_fd *ofd, struct msgb *msg)
rc = write(ofd->fd, msg->data, msg->len);
if (rc < 0) {
perror("writing msgb to gsmtap fd");
rc = write(ofd->fd, msg->data, msg->len);
if (rc < 0) {
perror("writing msgb to gsmtap fd");
- msgb_free(msg);
return rc;
}
if (rc != msg->len) {
perror("short write to gsmtap fd");
return rc;
}
if (rc != msg->len) {
perror("short write to gsmtap fd");
- msgb_free(msg);
return -EIO;
}
return -EIO;
}
- msgb_free(msg);
return 0;
}
return 0;
}