CVS commit: src/sys/rump/net/lib/libnetmpls

2016-08-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Aug  7 17:42:18 UTC 2016

Modified Files:
src/sys/rump/net/lib/libnetmpls: NETMPLS.ioconf netmpls_component.c

Log Message:
finish ifmpls->mpls renaming.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/libnetmpls/netmpls_component.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf
diff -u src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf:1.1 src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf:1.2
--- src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf:1.1	Thu Aug 20 08:20:09 2015
+++ src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf	Sun Aug  7 13:42:18 2016
@@ -1,7 +1,7 @@
-#	$NetBSD: NETMPLS.ioconf,v 1.1 2015/08/20 12:20:09 christos Exp $
+#	$NetBSD: NETMPLS.ioconf,v 1.2 2016/08/07 17:42:18 christos Exp $
 
 ioconf		netmpls
 
 include		"conf/files"
 
-pseudo-device   ifmpls
+pseudo-device   mpls

Index: src/sys/rump/net/lib/libnetmpls/netmpls_component.c
diff -u src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.4 src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.5
--- src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.4	Tue Jan 26 18:12:19 2016
+++ src/sys/rump/net/lib/libnetmpls/netmpls_component.c	Sun Aug  7 13:42:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: netmpls_component.c,v 1.4 2016/01/26 23:12:19 pooka Exp $ */
+/* $NetBSD: netmpls_component.c,v 1.5 2016/08/07 17:42:18 christos Exp $ */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.4 2016/01/26 23:12:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.5 2016/08/07 17:42:18 christos Exp $");
 
 #include 
 #include 
@@ -60,5 +60,5 @@ RUMP_COMPONENT(RUMP_COMPONENT_NET)
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
 {
 
-	ifmplsattach(0);
+	mplsattach(0);
 }



CVS commit: src/sys/rump/net/lib/libnetmpls

2014-03-12 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Thu Mar 13 02:05:29 UTC 2014

Modified Files:
src/sys/rump/net/lib/libnetmpls: Makefile
Added Files:
src/sys/rump/net/lib/libnetmpls: netmpls_component.c
Removed Files:
src/sys/rump/net/lib/libnetmpls: component.c

Log Message:
rename component.c - netmpls_component.c


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnetmpls/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/rump/net/lib/libnetmpls/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnetmpls/netmpls_component.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/net/lib/libnetmpls/Makefile
diff -u src/sys/rump/net/lib/libnetmpls/Makefile:1.1 src/sys/rump/net/lib/libnetmpls/Makefile:1.2
--- src/sys/rump/net/lib/libnetmpls/Makefile:1.1	Thu Jul 18 15:59:28 2013
+++ src/sys/rump/net/lib/libnetmpls/Makefile	Thu Mar 13 02:05:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/07/18 15:59:28 kefren Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 02:05:29 pooka Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../net ${.CURDIR}/../../../../netmpls
@@ -6,7 +6,7 @@
 LIB=	rumpnet_netmpls
 
 SRCS=	mpls_ttl.c if_mpls.c
-SRCS+=	component.c
+SRCS+=	netmpls_component.c
 
 CPPFLAGS+=	-I${.CURDIR}/../libnet/opt
 

Added files:

Index: src/sys/rump/net/lib/libnetmpls/netmpls_component.c
diff -u /dev/null src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.1
--- /dev/null	Thu Mar 13 02:05:29 2014
+++ src/sys/rump/net/lib/libnetmpls/netmpls_component.c	Thu Mar 13 02:05:29 2014
@@ -0,0 +1,64 @@
+/* $NetBSD: netmpls_component.c,v 1.1 2014/03/13 02:05:29 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
+ * Development of this software was supported by The Nokia Foundation
+ *
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: netmpls_component.c,v 1.1 2014/03/13 02:05:29 pooka Exp $);
+
+#include sys/param.h
+#include sys/domain.h
+#include sys/protosw.h
+
+#include net/if.h
+#include net/netisr.h
+#include net/route.h
+
+#include netmpls/mpls_var.h
+
+#include rump_private.h
+#include rump_net_private.h
+
+void ifmplsattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
+	extern struct domain mplsdomain;
+
+	DOMAINADD(mplsdomain);
+
+	rump_netisr_register(NETISR_MPLS, mplsintr);
+}
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+
+	ifmplsattach(0);
+}