port netbsd openbsd freebsd by leonkakaowiec6 · Pull Request #518 · yedino/galaxy42

leonkakaowiec6 · 2018-08-05T22:56:03Z

No description provided.

Fix build on macos Fix build on macos Fix build on macos

coveralls · 2018-08-05T23:18:36Z

Coverage decreased (-0.2%) to 42.613% when pulling 848cc61 on leonkakaowiec6:lk6_netbsd_openbsd_freebsd into 4847df6 on yedino:dev.

[wip] antinet_freebsd Fix compilation on FreeBSD and flags for tun if

Disable some piece of code

fix MacOSX readlink name fix MacOSX readlink name

…nd add condition for compile tuntap driver dependency of OS

robertoleksy · 2018-08-31T13:09:08Z

+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DANTINET_macosx")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DANTINET_macosx")
+endif()
+


why we need all this macros?

i think on configuration stage, not on compilation time and after clean "platform.hpp" in include directives, speed of compilation time going up. We need check this.

robertoleksy · 2018-08-31T13:14:13Z

@@ -0,0 +1,4 @@
+export CC=/usr/pkg/gcc7/bin/gcc


this should be cmake toolchain file

this is configuration files for env variables, to test. nothing more.

ok, so move this info toolchain file like cmake/toolchain_netbsd.cmake.in. We will need this for future builds.

robertoleksy · 2018-08-31T13:14:20Z

@@ -0,0 +1,4 @@
+export CC=/usr/local/bin/egcc


this should be cmake toolchain file

this is configuration files for env variables, to test. nothing more.

ok, so move this info toolchain file like cmake/toolchain_netbsd.cmake.in. We will need this for future builds.

robertoleksy · 2018-08-31T13:16:05Z

 export FAKETIME="$REFERENCE_DATETIME"

 # import functions
-. "${GALAXY_DIR}"/share/script/lib/fail.sh


this is really part of this PR?

i dont know what is it and from it is, not my commit.

robertoleksy · 2018-09-03T07:57:18Z

+}
+
+size_t c_tun_device_bsd::write_to_tun(void *buf, size_t count) {
+    int wret = write_tun(m_tun_fd, buf, count);


wres should be size_t

robertoleksy · 2018-09-05T08:59:29Z

-#ifdef __linux__
+#include "platform.hpp"

+#if defined(__linux__)


if platform.hpp is included we should use ANTINET_linux, ANTINET_windows and ANTINET_macosx macros

robertoleksy · 2018-09-05T09:02:37Z

+
+                t_ip_data m_ip_data; ///< current ip either ipv4, or ipv6, including the port too
+		boost::asio::ip::address m_address;
+		int m_port = 9042;


this should be unsigned short type (as in boost::asio)

robertoleksy · 2018-09-05T09:20:49Z


-#ifdef __FreeBSD__
-
+#if 0


delete this code if is not needed

robertoleksy · 2018-09-05T09:40:53Z

+		pfp_warn("Socket is disabled, listen_port="<<listen_port);
+		return;
+	}
+	assert(m_socket >= 0);


this should be if() throw, not assert

robertoleksy · 2018-09-05T09:43:14Z

+            pfp_throw_error_sub( tuntap_error_devtun , errorstring.str() );
+        }
+
+	assert( bind_result >= 0 ); // TODO change to except


change to except

robertoleksy · 2018-09-05T10:11:18Z

+	} else {
+	    user_home = b_fs::path(home_dir);
+	}
+	#endif


code for net, open and free bsd are the same

robertoleksy · 2018-09-05T10:46:13Z

+    auto asio_handler = [data, handler](const boost::system::error_code& error, std::size_t bytes_transferred) {
+        handler(data, bytes_transferred, error);
+    };
+    return m_tun_stream.async_read_some(boost::asio::buffer(data, size), asio_handler);


this is void method, return is not needed

robertoleksy · 2018-09-05T11:07:35Z

+        ~c_tuntap_system_functions() = default;
+
+        int ioctl(int fd, unsigned long request,  void *ifreq) override 
+        { 


move implementation to cpp file
this code is duplicated

robertoleksy · 2018-09-05T11:13:06Z

+
+                type = htonl(AF_INET6);
+
+                iv[0].iov_base = (char *)&type;


robertoleksy · 2018-09-05T11:13:13Z

+                u_int32_t type;
+                struct iovec iv[2];
+
+                iv[0].iov_base = (char *)&type;


robertoleksy · 2018-10-02T08:03:08Z

@@ -0,0 +1,4 @@
+export CC=/usr/pkg/gcc7/bin/gcc


ok, so move this info toolchain file like cmake/toolchain_netbsd.cmake.in. We will need this for future builds.

robertoleksy · 2018-10-02T08:03:57Z

@@ -0,0 +1,4 @@
+export CC=/usr/local/bin/egcc


ok, so move this info toolchain file like cmake/toolchain_netbsd.cmake.in. We will need this for future builds.

robertoleksy · 2018-10-02T08:07:33Z

-// end of: __win32 || __cygwin__ || __mach__ (multiplatform boost::asio)
 #endif

+#if defined(ANTINET_netbsd) || defined(ANTINET_openbsd) || defined(ANTINET_freebsd)


So do this refactoring.

robertoleksy · 2018-10-02T08:13:50Z

+
+#if defined(ANTINET_freebsd)
+// TODO: clean
+struct prf_ra {


I asked about the struct. Add comment.

robertoleksy · 2018-10-02T08:14:45Z

 #include <io.h>
 #ifndef NTSTATUS
-	#define NTSTATUS LONG
+#define NTSTATUS LONG


restore old indent

leonkakaowiec6 and others added 17 commits June 7, 2018 15:39

netbsd port

e9430e3

clean line

13b90f4

Cleaning code

58de92e

Fix build in linux

ac13255

capng recognize

3a488c7

gitian refac. doc, debug, tput problem fix (for on-target)

dd404ae

Fix conflicts

d891ca8

Fix function in between #define code

0ba0865

Fix MR comments

4afd534

In CMakeLists : system type, compiler version

0477c1e

antinet_netbsd, antinet_openbsd

84ca639

Fix return in errno_to_string()

757d6d7

CMakeLists.txt - add UNIX flag to Clang compiler, fix build Debian 8

dc8214e

Fix build on macos

18ae198

Fix build on macos Fix build on macos Fix build on macos

Fix build on macos

b43e2bf

Fix compilation error on OpenBSD6.3

be148e0

COTIRE - bool flag in ccmake, available only on Linux

b553354

leonkakaowiec6 added 3 commits August 6, 2018 02:45

[wip] antinet_freebsd

aeef699

Fix compilation on FreeBSD and flags for tun if

01e7378

NetBSD support in do script

5c2202e

leonkakaowiec6 force-pushed the lk6_netbsd_openbsd_freebsd branch 2 times, most recently from 9db626d to e660627 Compare August 15, 2018 22:54

leonkakaowiec6 added 2 commits August 16, 2018 00:32

COTIRE - bool flag in ccmake, available only on Linux

9a75f9b

[wip] antinet_freebsd Fix compilation on FreeBSD and flags for tun if

NetBSD support in do script

af42139

Disable some piece of code

leonkakaowiec6 force-pushed the lk6_netbsd_openbsd_freebsd branch 2 times, most recently from 99ae81b to e660627 Compare August 16, 2018 00:39

leonkakaowiec6 added 3 commits August 16, 2018 00:53

OpenBSD support in do script and fix MacOSX compilation

e660627

fix MacOSX readlink name fix MacOSX readlink name

FixConf and add OpenBSD support in do and disable some shit of code a…

07d3dec

…nd add condition for compile tuntap driver dependency of OS

ANTINET flags in CMakeLists.txt

aec995c

robertoleksy reviewed Sep 5, 2018

View reviewed changes

robertoleksy requested changes Sep 5, 2018

View reviewed changes

leonkakaowiec6 added 9 commits September 22, 2018 16:14

Merge branch 'origin_dev' into lk6_netbsd_openbsd_freebsd

a5f82b3

Fix conflicts in linux

77a0243

Fix macosx building

dad1272

m_tun_allow_init_failure on all os

b161c02

Fix build error

db666cf

do script in FreeBSD

ee1f2d5

Fix MR comments

f8fd1ec

Fix compilation on OpenBSD

bf11bd5

Fix compilation on FreeBSD

fbf90b8

robertoleksy requested changes Oct 2, 2018

View reviewed changes

leonkakaowiec6 added 2 commits October 10, 2018 17:37

Fix compilation on CYGWIN (2.11.1-1) and merge 538 patch from yedino

d8281bb

tun-missing-ok ANTINET_linux off

848cc61


		#ifdef __FreeBSD__

		#if 0

Uh oh!

Conversation

leonkakaowiec6 commented Aug 5, 2018

Uh oh!

coveralls commented Aug 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

leonkakaowiec6 Sep 22, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

coveralls commented Aug 5, 2018 •

edited

Loading

leonkakaowiec6 Sep 22, 2018 •

edited

Loading