Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  snmp: T1769: remove TSM (Transport Security Mode) support
  snmp: T818: T1738: remove per user/trap engine id
  T1759: ioctl.pm/interface.pm rewrite

3 files changed, 81 insertions, 0 deletions

diff --git a/python/vyos/iflag.py b/python/vyos/iflag.py
new file mode 100644
index 000000000..7ff8e5623
--- /dev/null
+++ b/python/vyos/iflag.py
@@ -0,0 +1,38 @@
+# Copyright 2019 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+from enum import Enum, unique, IntEnum
+
+
+class IFlag(IntEnum):
+    """ net/if.h interface flags """
+
+    IFF_UP = 0x1	        #: Interface up/down status
+    IFF_BROADCAST = 0x2	    #: Broadcast address valid
+    IFF_DEBUG = 0x4,		#: Debugging
+    IFF_LOOPBACK = 0x8		#: Is loopback network
+    IFF_POINTOPOINT = 0x10	#: Is point-to-point link
+    IFF_NOTRAILERS = 0x20	#: Avoid use of trailers 
+    IFF_RUNNING = 0x40		#: Resources allocated 
+    IFF_NOARP = 0x80		#: No address resolution protocol
+    IFF_PROMISC = 0x100	    #: Promiscuous mode
+    IFF_ALLMULTI = 0x200	#: Receive all multicast 
+    IFF_MASTER = 0x400		#: Load balancer master
+    IFF_SLAVE = 0x800		#: Load balancer slave
+    IFF_MULTICAST = 0x1000	#: Supports multicast
+    IFF_PORTSEL = 0x2000	#: Media type adjustable
+    IFF_AUTOMEDIA = 0x4000  #: Automatic media type enabled	
+    IFF_DYNAMIC = 0x8000	#: Is a dial-up device with dynamic address
+
diff --git a/python/vyos/interface.py b/python/vyos/interface.py
index 1aae6db60..cc726e5cc 100644
--- a/python/vyos/interface.py
+++ b/python/vyos/interface.py
@@ -16,6 +16,8 @@
 import vyos
 from vyos.config import Config
 import vyos.interfaces
+import vyos.ioctl
+from vyos.iflag import IFlag
 
 import re
 import json
@@ -33,11 +35,18 @@ class Interface():
     intf = None
     intf_type = None
     valid = False
+    flags = None
 
     def __init__(self,intf):
         self.intf = intf
         self.intf_type = vyos.interfaces.get_type_of_interface(self.intf)
         self.valid = (self.intf in vyos.interfaces.list_interfaces())
+        if (self.valid):
+            self.flags = vyos.ioctl.get_interface_flags(intf)
+    
+    def up(self):
+        """ return whether interface is up or not """
+        return self.flags & IFlag.IFF_UP
 
     def print_interface(self):
 
diff --git a/python/vyos/ioctl.py b/python/vyos/ioctl.py
new file mode 100644
index 000000000..e57d261e4
--- /dev/null
+++ b/python/vyos/ioctl.py
@@ -0,0 +1,34 @@
+# Copyright 2019 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import fcntl, struct, sys
+from socket import *
+
+SIOCGIFFLAGS = 0x8913
+
+def get_terminal_size():
+    """ pull the terminal size """
+    """ rows,cols = vyos.ioctl.get_terminal_size() """
+    columns, rows = os.get_terminal_size(0)
+    return (rows,columns)
+
+def get_interface_flags(intf):
+    """ Pull the SIOCGIFFLAGS """
+    nullif = '\0'*256 
+    sock = socket(AF_INET, SOCK_DGRAM)
+    raw = fcntl.ioctl(sock.fileno(), SIOCGIFFLAGS, intf + nullif)
+    flags, = struct.unpack('H', raw[16:18])
+    return flags