[ViewVC] Diff of: cvs/gvpe/src/device-tincd.C

Comparing gvpe/src/device-tincd.C (file contents):
Revision 1.17 by pcg, Fri Mar 25 15:38:07 2005 UTC vs.
Revision 1.20 by pcg, Sun Dec 2 00:45:42 2007 UTC

     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
     along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <cstdio>
 #include <cstring>
 #include <cerrno>
 #define MTU MAX_MTU
 // BIGGEST hack of 'em all
 // will be casted to data_packet, due to structural similarity
-struct vpn_packet_t : net_packet {
+struct vpn_packet_t : net_packet
+{
   u8 data[MAXSIZE];
 };
 static bool overwrite_mac;
 {
   if (!strcmp (key, "Interface"))
     *res = conf.ifname;
   else if (!strcmp (key, "Device"))
     *res = 0;
+  else if (!strcmp (key, "DeviceType"))
+    *res = "tap";
   else
     {
       slog (L_ERR, _("tincd layer asking for unknown config '%s'"), key);
       *res = 0;
     }
 #define netname conf.ifname
 #if IF_linux
 # include "tincd/linux/device.c"
 const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME hw ether $MAC mtu $MTU"; }
+#elif IF_bsd
+# include "tincd/bsd/device.c"
+const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
 #elif IF_freebsd
 # include "tincd/freebsd/device.c"
 const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines