summaryrefslogtreecommitdiff
path: root/src/channel.c
diff options
context:
space:
mode:
authorAlex Harpin <development@landsofshadow.co.uk>2015-10-02 07:43:42 +0100
committerAlex Harpin <development@landsofshadow.co.uk>2015-10-02 07:43:42 +0100
commitef5ae91676c8ada2a12ea72f889a54452dd94981 (patch)
tree0a962905ab9d0c2322f627928521a10c4cb5e20f /src/channel.c
parent9f9a63cecdc6ac4f449d3eacda6c591f0de9fbf3 (diff)
parent8845f3db20c951fcf1db3229a818cfd185f17f2e (diff)
downloadconntrack-tools-ef5ae91676c8ada2a12ea72f889a54452dd94981.tar.gz
conntrack-tools-ef5ae91676c8ada2a12ea72f889a54452dd94981.zip
Merge remote-tracking branch 'source/master' into upstreamupstream
Diffstat (limited to 'src/channel.c')
-rw-r--r--src/channel.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/channel.c b/src/channel.c
index 818bb01..acbfa7d 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -109,6 +109,7 @@ channel_open(struct channel_conf *cfg)
if (ioctl(fd, SIOCGIFMTU, &ifr) == -1) {
free(c);
+ close(fd);
return NULL;
}
close(fd);
@@ -310,3 +311,8 @@ int channel_accept(struct channel *c)
{
return c->ops->accept(c);
}
+
+int channel_type(struct channel *c)
+{
+ return c->ops->type;
+}