mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 10:04:04 +02:00
selftest: tun: Format tun.c existing code
In preparation for adding new tests for GSO over UDP tunnels, apply consistently the kernel style to the existing code. Signed-off-by: Xu Du <xudu@redhat.com> Link: https://patch.msgid.link/d797de1e5a3d215dd78cb46775772ef682bab60e.1768979440.git.xudu@redhat.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
35527de54f
commit
e073c118db
|
|
@ -25,7 +25,7 @@ static int tun_attach(int fd, char *dev)
|
|||
strcpy(ifr.ifr_name, dev);
|
||||
ifr.ifr_flags = IFF_ATTACH_QUEUE;
|
||||
|
||||
return ioctl(fd, TUNSETQUEUE, (void *) &ifr);
|
||||
return ioctl(fd, TUNSETQUEUE, (void *)&ifr);
|
||||
}
|
||||
|
||||
static int tun_detach(int fd, char *dev)
|
||||
|
|
@ -36,7 +36,7 @@ static int tun_detach(int fd, char *dev)
|
|||
strcpy(ifr.ifr_name, dev);
|
||||
ifr.ifr_flags = IFF_DETACH_QUEUE;
|
||||
|
||||
return ioctl(fd, TUNSETQUEUE, (void *) &ifr);
|
||||
return ioctl(fd, TUNSETQUEUE, (void *)&ifr);
|
||||
}
|
||||
|
||||
static int tun_alloc(char *dev)
|
||||
|
|
@ -54,7 +54,7 @@ static int tun_alloc(char *dev)
|
|||
strcpy(ifr.ifr_name, dev);
|
||||
ifr.ifr_flags = IFF_TAP | IFF_NAPI | IFF_MULTI_QUEUE;
|
||||
|
||||
err = ioctl(fd, TUNSETIFF, (void *) &ifr);
|
||||
err = ioctl(fd, TUNSETIFF, (void *)&ifr);
|
||||
if (err < 0) {
|
||||
fprintf(stderr, "can't TUNSETIFF: %s\n", strerror(errno));
|
||||
close(fd);
|
||||
|
|
@ -67,9 +67,9 @@ static int tun_alloc(char *dev)
|
|||
static int tun_delete(char *dev)
|
||||
{
|
||||
struct {
|
||||
struct nlmsghdr nh;
|
||||
struct nlmsghdr nh;
|
||||
struct ifinfomsg ifm;
|
||||
unsigned char data[64];
|
||||
unsigned char data[64];
|
||||
} req;
|
||||
struct rtattr *rta;
|
||||
int ret, rtnl;
|
||||
|
|
@ -127,31 +127,36 @@ FIXTURE_TEARDOWN(tun)
|
|||
close(self->fd2);
|
||||
}
|
||||
|
||||
TEST_F(tun, delete_detach_close) {
|
||||
TEST_F(tun, delete_detach_close)
|
||||
{
|
||||
EXPECT_EQ(tun_delete(self->ifname), 0);
|
||||
EXPECT_EQ(tun_detach(self->fd, self->ifname), -1);
|
||||
EXPECT_EQ(errno, 22);
|
||||
}
|
||||
|
||||
TEST_F(tun, detach_delete_close) {
|
||||
TEST_F(tun, detach_delete_close)
|
||||
{
|
||||
EXPECT_EQ(tun_detach(self->fd, self->ifname), 0);
|
||||
EXPECT_EQ(tun_delete(self->ifname), 0);
|
||||
}
|
||||
|
||||
TEST_F(tun, detach_close_delete) {
|
||||
TEST_F(tun, detach_close_delete)
|
||||
{
|
||||
EXPECT_EQ(tun_detach(self->fd, self->ifname), 0);
|
||||
close(self->fd);
|
||||
self->fd = -1;
|
||||
EXPECT_EQ(tun_delete(self->ifname), 0);
|
||||
}
|
||||
|
||||
TEST_F(tun, reattach_delete_close) {
|
||||
TEST_F(tun, reattach_delete_close)
|
||||
{
|
||||
EXPECT_EQ(tun_detach(self->fd, self->ifname), 0);
|
||||
EXPECT_EQ(tun_attach(self->fd, self->ifname), 0);
|
||||
EXPECT_EQ(tun_delete(self->ifname), 0);
|
||||
}
|
||||
|
||||
TEST_F(tun, reattach_close_delete) {
|
||||
TEST_F(tun, reattach_close_delete)
|
||||
{
|
||||
EXPECT_EQ(tun_detach(self->fd, self->ifname), 0);
|
||||
EXPECT_EQ(tun_attach(self->fd, self->ifname), 0);
|
||||
close(self->fd);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user