CVS commit: src/sys/rump/dev/lib/libnetsmb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 20 14:27:15 UTC 2015

Modified Files:
src/sys/rump/dev/lib/libnetsmb: Makefile

Log Message:
XXX: there must be a better way to do this.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libnetsmb/Makefile

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/dev/lib/libnetsmb/Makefile
diff -u src/sys/rump/dev/lib/libnetsmb/Makefile:1.6 src/sys/rump/dev/lib/libnetsmb/Makefile:1.7
--- src/sys/rump/dev/lib/libnetsmb/Makefile:1.6	Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libnetsmb/Makefile	Thu Aug 20 10:27:15 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2015/08/20 11:51:12 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2015/08/20 14:27:15 christos Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../netsmb
@@ -14,7 +14,7 @@ CPPFLAGS+=	-I${RUMPTOP}/librump/rumpvfs
 #CPPFLAGS+=	-DSMB_SOCKET_DEBUG -DSMB_IOD_DEBUG
 
 SRCS+=	netsmb_iconv.c
-#RUMPCOMP_USER_SRCS=	netsmb_user.c
+RUMPCOMP_USER_SRCS=	netsmb_user.c
 
 .include bsd.lib.mk
 .include bsd.klinks.mk

CVS commit: src/sys/rump/dev/lib/libnetsmb

[Takeshi Nakayama]

Module Name:src
Committed By:   nakayama
Date:   Sun Nov 16 15:31:12 UTC 2014

Modified Files:
src/sys/rump/dev/lib/libnetsmb: netsmb_user.c

Log Message:
Wrap iconv.h also with #ifdef __NetBSD__.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libnetsmb/netsmb_user.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/dev/lib/libnetsmb/netsmb_user.c
diff -u src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.2 src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.3
--- src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.2	Sun Nov 16 04:26:46 2014
+++ src/sys/rump/dev/lib/libnetsmb/netsmb_user.c	Sun Nov 16 15:31:12 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: netsmb_user.c,v 1.2 2014/11/16 04:26:46 nakayama Exp $	*/
+/*	$NetBSD: netsmb_user.c,v 1.3 2014/11/16 15:31:12 nakayama Exp $	*/
 
 /*
  * Copyright (c) 2014 Takeshi Nakayama.
@@ -26,8 +26,10 @@
  */
 #ifndef _KERNEL
 #include stddef.h
-#include iconv.h
 #include errno.h
+#ifdef __NetBSD__
+#include iconv.h
+#endif
 
 #include rump/rumpuser_component.h
 

CVS commit: src/sys/rump/dev/lib/libnetsmb

[Takeshi Nakayama]

Module Name:src
Committed By:   nakayama
Date:   Sun Nov 16 04:26:46 UTC 2014

Modified Files:
src/sys/rump/dev/lib/libnetsmb: netsmb_user.c

Log Message:
Using host iconv(3) is limited to NetBSD host.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libnetsmb/netsmb_user.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/dev/lib/libnetsmb/netsmb_user.c
diff -u src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.1 src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.2
--- src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.1	Sat Nov 15 18:49:04 2014
+++ src/sys/rump/dev/lib/libnetsmb/netsmb_user.c	Sun Nov 16 04:26:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: netsmb_user.c,v 1.1 2014/11/15 18:49:04 nakayama Exp $	*/
+/*	$NetBSD: netsmb_user.c,v 1.2 2014/11/16 04:26:46 nakayama Exp $	*/
 
 /*
  * Copyright (c) 2014 Takeshi Nakayama.
@@ -36,6 +36,7 @@
 int
 rumpcomp_netsmb_iconv_open(const char *to, const char *from, void **handle)
 {
+#ifdef __NetBSD__
 	iconv_t cd;
 	int rv;
 
@@ -49,11 +50,16 @@ rumpcomp_netsmb_iconv_open(const char *t
 	}
 
 	return rumpuser_component_errtrans(rv);
+#else
+	/* fallback to use dumb copy function */
+	return 0;
+#endif
 }
 
 int
 rumpcomp_netsmb_iconv_close(void *handle)
 {
+#ifdef __NetBSD__
 	int rv;
 
 	if (iconv_close((iconv_t)handle) == -1)
@@ -62,12 +68,17 @@ rumpcomp_netsmb_iconv_close(void *handle
 		rv = 0;
 
 	return rumpuser_component_errtrans(rv);
+#else
+	/* do nothing */
+	return 0;
+#endif
 }
 
 int
 rumpcomp_netsmb_iconv_conv(void *handle, const char **inbuf,
 size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
 {
+#ifdef __NetBSD__
 	int rv;
 
 	if (iconv((iconv_t)handle, inbuf, inbytesleft, outbuf, outbytesleft)
@@ -77,5 +88,9 @@ rumpcomp_netsmb_iconv_conv(void *handle,
 		rv = 0;
 
 	return rumpuser_component_errtrans(rv);
+#else
+	/* do nothing */
+	return 0;
+#endif
 }
 #endif

CVS commit: src/sys/rump/dev/lib/libnetsmb

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Jul 18 16:25:17 UTC 2014

Modified Files:
src/sys/rump/dev/lib/libnetsmb: netsmb_component.c

Log Message:
Fix the ATF failures caused by my recent smbfs change (smbfs_vfsops.c -r1.103).

ok pooka@


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libnetsmb/netsmb_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/dev/lib/libnetsmb/netsmb_component.c
diff -u src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.1 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.2
--- src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.1	Thu Mar 13 01:57:29 2014
+++ src/sys/rump/dev/lib/libnetsmb/netsmb_component.c	Fri Jul 18 16:25:17 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $	*/
+/*	$NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -48,7 +48,8 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 	int error;
 
 	bmaj = cmaj = NODEVMAJOR;
-	if ((error = devsw_attach(nsmb, NULL, bmaj, nsmb_cdevsw, cmaj))!=0)
+	error = devsw_attach(nsmb, NULL, bmaj, nsmb_cdevsw, cmaj);
+	if (error  error != EEXIST)
 		panic(nsmb devsw attach failed: %d, error);
 	if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/nsmb, '0',
 	cmaj, 0, 4)) != 0)

CVS commit: src/sys/rump/dev/lib/libnetsmb

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Mar 13 01:57:29 UTC 2014

Modified Files:
src/sys/rump/dev/lib/libnetsmb: Makefile
Added Files:
src/sys/rump/dev/lib/libnetsmb: netsmb_component.c
Removed Files:
src/sys/rump/dev/lib/libnetsmb: component.c

Log Message:
rename component.c - netsmb_component.c


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libnetsmb/Makefile
cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/lib/libnetsmb/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libnetsmb/netsmb_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/dev/lib/libnetsmb/Makefile
diff -u src/sys/rump/dev/lib/libnetsmb/Makefile:1.3 src/sys/rump/dev/lib/libnetsmb/Makefile:1.4
--- src/sys/rump/dev/lib/libnetsmb/Makefile:1.3	Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/lib/libnetsmb/Makefile	Thu Mar 13 01:57:29 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/02/16 20:42:45 pooka Exp $
+#	$NetBSD: Makefile,v 1.4 2014/03/13 01:57:29 pooka Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../netsmb
@@ -8,7 +8,7 @@ LIB=	rumpdev_netsmb
 SRCS=	iconv.c smb_conn.c smb_crypt.c smb_dev.c smb_iod.c smb_rq.c	\
 	smb_smb.c smb_subr.c smb_trantcp.c smb_usr.c subr_mchain.c
 
-SRCS+=	component.c
+SRCS+=	netsmb_component.c
 
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpvfs
 #CPPFLAGS+=	-DSMB_SOCKET_DEBUG -DSMB_IOD_DEBUG

Added files:

Index: src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
diff -u /dev/null src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.1
--- /dev/null	Thu Mar 13 01:57:29 2014
+++ src/sys/rump/dev/lib/libnetsmb/netsmb_component.c	Thu Mar 13 01:57:29 2014
@@ -0,0 +1,58 @@
+/*	$NetBSD: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
+ * Development of this software was supported by The Nokia Foundation
+ *
+ * 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: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+void nsmbattach(int); /* XXX */
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+	extern const struct cdevsw nsmb_cdevsw;
+	devmajor_t bmaj, cmaj;
+	int error;
+
+	bmaj = cmaj = NODEVMAJOR;
+	if ((error = devsw_attach(nsmb, NULL, bmaj, nsmb_cdevsw, cmaj))!=0)
+		panic(nsmb devsw attach failed: %d, error);
+	if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/nsmb, '0',
+	cmaj, 0, 4)) != 0)
+		panic(cannot create nsmb device nodes: %d, error);
+
+	rump_pdev_add(nsmbattach, 4);
+}