bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-01-08 22:12:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Print VSOCK warning only with VSOCK-LISTEN

Browse source
This commit is contained in:
Gerhard Rieger 2021-10-24 16:38:34 +02:00
parent e78e911cbb
commit e9c055b750
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -10,6 +10,9 @@ Corrections:
Fixed a few minor coding issues Fixed a few minor coding issues
A VSOCK warning message was generated with all listening addresses
instead of only with VSOCK-LISTEN
Testing: Testing:
Prevent the TIMESTAMP tests from sporadically failing due do seconds Prevent the TIMESTAMP tests from sporadically failing due do seconds
overflow overflow

12
xio-listen.c
View file

@ -152,18 +152,6 @@ int _xioopen_listen(struct single *xfd, int xioflags, struct sockaddr *us, sockl
applyopts_offset(xfd, opts); applyopts_offset(xfd, opts);
applyopts_cloexec(xfd->fd, opts); applyopts_cloexec(xfd->fd, opts);
#if defined(WITH_VSOCK) && defined(IOCTL_VM_SOCKETS_GET_LOCAL_CID)
{
unsigned int cid;
if (Ioctl(xfd->fd, IOCTL_VM_SOCKETS_GET_LOCAL_CID, &cid) < 0) {
Warn2("ioctl(%d, IOCTL_VM_SOCKETS_GET_LOCAL_CID, ...): %s",
xfd->fd, strerror(errno));
} else {
Notice1("VSOCK CID=%u", cid);
}
}
#endif
applyopts(xfd->fd, opts, PH_PREBIND); applyopts(xfd->fd, opts, PH_PREBIND);
applyopts(xfd->fd, opts, PH_BIND); applyopts(xfd->fd, opts, PH_BIND);
if (Bind(xfd->fd, (struct sockaddr *)us, uslen) < 0) { if (Bind(xfd->fd, (struct sockaddr *)us, uslen) < 0) {

10
xio-vsock.c
View file

@ -139,6 +139,16 @@ static int xioopen_vsock_listen(int argc, const char *argv[], struct opt *opts,
return ret; return ret;
} }
{
unsigned int cid;
if (Ioctl(xfd->fd, IOCTL_VM_SOCKETS_GET_LOCAL_CID, &cid) < 0) {
Warn2("ioctl(%d, IOCTL_VM_SOCKETS_GET_LOCAL_CID, ...): %s",
xfd->fd, strerror(errno));
} else {
Notice1("VSOCK CID=%u", cid);
}
}
opts0 = copyopts(opts, GROUP_ALL); opts0 = copyopts(opts, GROUP_ALL);
ret = retropt_bind(opts, pf, socktype, protocol, (struct sockaddr *)&sa_bind, ret = retropt_bind(opts, pf, socktype, protocol, (struct sockaddr *)&sa_bind,