[rtems-libbsd commit] SOCKATMARK(3): Import from FreeBSD

Sebastian Huber sebh at rtems.org
Thu Dec 19 09:51:00 UTC 2019


Module:    rtems-libbsd
Branch:    master
Commit:    d892051f37c2c4ad7f345f6a817ea3d38e56a431
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=d892051f37c2c4ad7f345f6a817ea3d38e56a431

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Dec 19 10:50:12 2019 +0100

SOCKATMARK(3): Import from FreeBSD

Update #3798.

---

 freebsd/lib/libc/net/sockatmark.c | 43 +++++++++++++++++++++++++++++++++++++++
 libbsd.py                         |  1 +
 testsuite/syscalls01/test_main.c  | 30 +++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/freebsd/lib/libc/net/sockatmark.c b/freebsd/lib/libc/net/sockatmark.c
new file mode 100644
index 0000000..9d5bccc
--- /dev/null
+++ b/freebsd/lib/libc/net/sockatmark.c
@@ -0,0 +1,43 @@
+#include <machine/rtems-bsd-user-space.h>
+
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2002 William C. Fenner.  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 CONTRIBUTORS ``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 REGENTS 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.
+ *
+ * $FreeBSD$
+ */
+#include "namespace.h"
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include "un-namespace.h"
+
+int sockatmark(int s)
+{
+	int atmark;
+
+	if (_ioctl(s, SIOCATMARK, &atmark) == -1)
+		return -1;
+	return atmark;
+}
diff --git a/libbsd.py b/libbsd.py
index d3a1174..bd24cd6 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -3001,6 +3001,7 @@ class user_space(builder.Module):
                 'lib/libc/net/recv.c',
                 'lib/libc/net/rthdr.c',
                 'lib/libc/net/send.c',
+                'lib/libc/net/sockatmark.c',
                 'lib/libc/net/vars.c',
                 'lib/libc/posix1e/mac.c',
                 'lib/libc/resolv/h_errno.c',
diff --git a/testsuite/syscalls01/test_main.c b/testsuite/syscalls01/test_main.c
index c1c15d2..78c7dd4 100644
--- a/testsuite/syscalls01/test_main.c
+++ b/testsuite/syscalls01/test_main.c
@@ -566,6 +566,35 @@ test_socket_ioctl(void)
 }
 
 static void
+test_socket_sockatmark(void)
+{
+	rtems_resource_snapshot snapshot;
+	int sd;
+	int rv;
+
+	puts("test socket sockatmark");
+
+	rtems_resource_snapshot_take(&snapshot);
+
+	sd = socket(PF_INET, SOCK_DGRAM, 0);
+	assert(sd >= 0);
+
+	rv = sockatmark(sd);
+	assert(rv == 0);
+
+	rv = close(sd);
+	assert(rv == 0);
+
+	errno = 0;
+	rv = sockatmark(sd);
+	assert(rv == -1);
+	assert(errno == EBADF);
+
+	epoch_cleanup();
+	assert(rtems_resource_snapshot_check(&snapshot));
+}
+
+static void
 no_mem_socket_bind(int fd)
 {
 	struct sockaddr_in addr;
@@ -1727,6 +1756,7 @@ test_main(void)
 
 	test_socket_unsupported_ops();
 	test_socket_ioctl();
+	test_socket_sockatmark();
 	test_socket_bind();
 	test_socket_connect();
 	test_socket_listen();



More information about the vc mailing list