Added missing includes: <netinet/in.h> and <sys/socket.h> #473

yurivict · 2017-02-13T06:29:19Z

Found these missing includes while compiling on FreeBSD 11.

This change is

iphydf · 2017-02-15T09:41:57Z

This breaks windows: https://travis-ci.org/TokTok/c-toxcore/jobs/201035192#L1512

Diadlo · 2017-02-15T17:18:54Z

Try to remove all this includes and add them into network.h with freebsd ifdef

yurivict · 2017-02-15T18:35:20Z

I moved them into natwork.h
But it looks like ifdef FreeBSD should also be dropped, because linux should need the same includes. They probably get in accidentally on linux through some other path.

Diadlo · 2017-02-16T04:10:05Z

@yurivict Do we really need to include it directly on linux? If you think so, feel free to replace on UNIX ifdef (but not drop)

yurivict · 2017-02-16T04:56:00Z

I updated the patch.

Moved all network-related includes together into network.h
Updated the comment there to say "UNIX includes"

On all UNIXes basic network includes should be the same. It's better to keep them in one place - network.h. Before on Linux some of them were included through some other includes despite manpages saying they should be included.

Diadlo · 2017-02-16T07:14:06Z

@yurivict In real, this includes should be in network.cpp. But network.h should provide platform independent interface (work in progress)

Reviewed 3 of 3 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved, some commit checks failed.

Comments from Reviewable

nurupo · 2017-03-06T19:09:19Z

Can confirm, toxcore doesn't build on FreeBSD 11.0 and this PR fixes the issue.

FreeBSD doesn't have IPV6_ADD_MEMBERSHIP and IPV6_DROP_MEMBERSHIP defined, IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP should be used instead. There is already a code block in network.c that handles this:

#ifndef IPV6_ADD_MEMBERSHIP
#ifdef  IPV6_JOIN_GROUP
#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
#endif
#endif

The issue is that netinet/in.h needs to be included before this code block, as that's where the IPV6_JOIN_GROUP is defined.

You also need to include sys/socket.h in network.h for AF_INET6 and AF_INET to be defined, which are used in DHT.c.

nurupo · 2017-03-06T19:47:35Z

@Diadlo do you think we can merge this PR now or we still need to wait for the network refactor? It looks like there is still work to be done in network refactoring since this is an issue

You also need to include sys/socket.h in network.h for AF_INET6 and AF_INET to be defined, which are used in DHT.c.

Ideally DHT.c would use platform independent network interface, rather than using AF_INET6 and AF_INET.

Diadlo · 2017-03-06T19:53:09Z

@nurupo I'm currently working on replacing AF_INET on platform independent TOX_AF_INET. It will be in the next network refactoring PR. So you can merge this PR (in my opinion)

nurupo · 2017-03-06T20:00:25Z

Then you'd need to refactoring this merge in that next refactoring PR.

Diadlo · 2017-03-06T20:10:14Z

Yes, but currently we haven't base for the writing right platform-independent code

iphydf · 2017-03-26T12:43:35Z

@yurivict can you rebase on master, and also enable the checkbox that lets collaborators push to the PR branch.

yurivict · 2017-03-26T15:19:59Z

I rebased and enabled the checkbox.

thierry-FreeBSD · 2017-03-27T17:38:49Z

In 0.1.7 netinet/in.h is still missing in toxcore/network.c

--- toxcore/network.c.orig      2017-03-26 13:42:48 UTC
+++ toxcore/network.c
@@ -43,6 +43,10 @@
 #include <mach/mach.h>
 #endif
 
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
+
 #ifndef IPV6_ADD_MEMBERSHIP
 #ifdef  IPV6_JOIN_GROUP
 #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP

yurivict · 2017-03-27T17:57:31Z

#ifdef __FreeBSD__ shouldn't be needed. It doesn't complain on linux only because of the accidental inclusion somewhere else.

Found these missing includes while compiling on FreeBSD 11.

thierry-FreeBSD · 2017-12-27T16:29:27Z

v0.1.11 is still unbuildable on FreeBSD:

FAILED: CMakeFiles/toxcore-sut.dir/testing/hstox/driver.c.o 
/usr/local/libexec/ccache/cc  -I/usr/local/include -I/usr/local/include/opus -I/usr/local/include/opencv -O2 -pipe  -fstack-protector -fno-strict-aliasing -std=c99 -pedantic -Wall -Wextra -Weverything -Wno-cast-align -Wno-conversion -Wno-covered-switch-default -Wno-disabled-macro-expansion -Wno-documentation-deprecated-sync -Wno-format-nonliteral -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-padded -Wno-parentheses -Wno-return-type -Wno-sign-compare -Wno-sign-conversion -Wno-tautological-constant-out-of-range-compare -Wno-thread-safety-analysis -Wno-type-limits -Wno-undef -Wno-unreachable-code -Wno-unused-macros -Wno-unused-parameter -Wno-vla -Wno-assign-enum -Wno-bad-function-cast -Wno-double-promotion -Wno-gnu-zero-variadic-macro-arguments -Wno-packed -Wno-reserved-id-macro -Wno-shadow -Wno-shorten-64-to-32 -Wno-unreachable-code-return -Wno-used-but-marked-unused -isystem /usr/local/include -isystem /usr/local/include/opus -isystem /usr/local/include -isystem /usr/local/include -isystem /usr/local/include -isystem /usr/local/include -isystem /usr/local/include -isystem /usr/local/include -isystem /usr/local/include -O2 -pipe  -fstack-protector -fno-strict-aliasing -MD -MT CMakeFiles/toxcore-sut.dir/testing/hstox/driver.c.o -MF CMakeFiles/toxcore-sut.dir/testing/hstox/driver.c.o.d -o CMakeFiles/toxcore-sut.dir/testing/hstox/driver.c.o   -c testing/hstox/driver.c
testing/hstox/driver.c:71:49: error: use of undeclared identifier 'S_IRUSR'
    int fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
                                                ^
testing/hstox/driver.c:71:59: error: use of undeclared identifier 'S_IWUSR'
    int fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
                                                          ^
testing/hstox/driver.c:226:24: error: variable has incomplete type 'struct sockaddr_in'
    struct sockaddr_in servaddr;
                       ^
testing/hstox/driver.c:226:12: note: forward declaration of 'struct sockaddr_in'
    struct sockaddr_in servaddr;
           ^
testing/hstox/driver.c:228:38: error: use of undeclared identifier 'INADDR_ANY'
    servaddr.sin_addr.s_addr = htons(INADDR_ANY);
                                     ^
testing/hstox/driver.c:228:38: error: use of undeclared identifier 'INADDR_ANY'
testing/hstox/driver.c:228:38: error: use of undeclared identifier 'INADDR_ANY'
testing/hstox/driver.c:228:38: error: use of undeclared identifier 'INADDR_ANY'
7 errors generated.

nurupo · 2017-12-27T17:45:43Z

Why are you trying to build the incomplete Haskell testing framework testing/hstox?

nurupo · 2017-12-27T17:47:14Z

v0.1.11 builds fine on FreeBSD, we have a Travis CI check for that. It doesn't build everything under the sun though, just the actual library and autotests for it, not testing/hstox and others.

thierry-FreeBSD · 2017-12-27T18:50:35Z

You're right: removing testing/hstox does it.

nurupo · 2017-12-27T19:36:51Z

Oh, I'm sorry, I thought hstox wasn't enabled by default and that you were explicitly enabling it by some compile flag, but apparently hstox gets built by default if MSGPACK was found.

thierry-FreeBSD · 2017-12-27T20:03:07Z

Yes, I patched CMakeLists.txt to remove it.

nurupo · 2017-12-27T20:07:43Z

Yeah, we should probably make it build on FreeBSD given how it's enabled by default, or disable it by default and hide under a build flag. @robinlinden @iphydf

jhert0 · 2017-12-28T16:33:07Z

@thierry-FreeBSD hstox should compile on FreeBSD when #648 is merged.

SkyzohKey added CAT:code_cleanup network Network P1 High priority labels Feb 13, 2017

SkyzohKey requested a review from iphydf February 13, 2017 17:07

iphydf removed their request for review February 15, 2017 09:40

iphydf assigned Diadlo Feb 15, 2017

yurivict force-pushed the missing-includes branch from 0cc2498 to f340d0c Compare February 15, 2017 18:33

yurivict force-pushed the missing-includes branch 2 times, most recently from 0d96a95 to 0e73f9d Compare February 16, 2017 04:52

iphydf modified the milestone: v0.1.7 Feb 26, 2017

yurivict mentioned this pull request Mar 6, 2017

Testsuite fails and hangs on FreeBSD #501

Closed

nurupo mentioned this pull request Mar 14, 2017

Add FreeBSD Travis #505

Merged

yurivict mentioned this pull request Mar 15, 2017

cmake build fails qTox/qTox#4175

Closed

SkyzohKey added PR:ready labels Mar 21, 2017

iphydf modified the milestones: v0.1.7, v0.1.8 Mar 26, 2017

iphydf modified the milestones: v0.1.8, v0.1.7 Mar 26, 2017

Added missing includes: <netinet/in.h> and <sys/socket.h>

f751fcf

Found these missing includes while compiling on FreeBSD 11.

iphydf force-pushed the missing-includes branch from 9ca2a6d to f751fcf Compare April 12, 2017 21:35

iphydf removed P1 High priority PR:stale labels Apr 12, 2017

robinlinden merged commit f751fcf into TokTok:master Apr 12, 2017

nurupo mentioned this pull request Jul 22, 2017

tests fail on openbsd 6.1 #570

Closed

iphydf added refactor Refactoring production code, eg. renaming a variable, not affecting semantics and removed code cleanup labels May 4, 2020

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added missing includes: <netinet/in.h> and <sys/socket.h> #473

Added missing includes: <netinet/in.h> and <sys/socket.h> #473

yurivict commented Feb 13, 2017 •

edited by iphydf

Loading

iphydf commented Feb 15, 2017

Diadlo commented Feb 15, 2017

yurivict commented Feb 15, 2017 •

edited

Loading

Diadlo commented Feb 16, 2017

yurivict commented Feb 16, 2017

Diadlo commented Feb 16, 2017

nurupo commented Mar 6, 2017 •

edited

Loading

nurupo commented Mar 6, 2017

Diadlo commented Mar 6, 2017 •

edited

Loading

nurupo commented Mar 6, 2017

Diadlo commented Mar 6, 2017

iphydf commented Mar 26, 2017

yurivict commented Mar 26, 2017

thierry-FreeBSD commented Mar 27, 2017

yurivict commented Mar 27, 2017 •

edited

Loading

thierry-FreeBSD commented Dec 27, 2017

nurupo commented Dec 27, 2017

nurupo commented Dec 27, 2017

thierry-FreeBSD commented Dec 27, 2017

nurupo commented Dec 27, 2017 •

edited

Loading

thierry-FreeBSD commented Dec 27, 2017

nurupo commented Dec 27, 2017

jhert0 commented Dec 28, 2017

Added missing includes: <netinet/in.h> and <sys/socket.h> #473

Added missing includes: <netinet/in.h> and <sys/socket.h> #473

Conversation

yurivict commented Feb 13, 2017 • edited by iphydf Loading

iphydf commented Feb 15, 2017

Diadlo commented Feb 15, 2017

yurivict commented Feb 15, 2017 • edited Loading

Diadlo commented Feb 16, 2017

yurivict commented Feb 16, 2017

Diadlo commented Feb 16, 2017

nurupo commented Mar 6, 2017 • edited Loading

nurupo commented Mar 6, 2017

Diadlo commented Mar 6, 2017 • edited Loading

nurupo commented Mar 6, 2017

Diadlo commented Mar 6, 2017

iphydf commented Mar 26, 2017

yurivict commented Mar 26, 2017

thierry-FreeBSD commented Mar 27, 2017

yurivict commented Mar 27, 2017 • edited Loading

thierry-FreeBSD commented Dec 27, 2017

nurupo commented Dec 27, 2017

nurupo commented Dec 27, 2017

thierry-FreeBSD commented Dec 27, 2017

nurupo commented Dec 27, 2017 • edited Loading

thierry-FreeBSD commented Dec 27, 2017

nurupo commented Dec 27, 2017

jhert0 commented Dec 28, 2017

yurivict commented Feb 13, 2017 •

edited by iphydf

Loading

yurivict commented Feb 15, 2017 •

edited

Loading

nurupo commented Mar 6, 2017 •

edited

Loading

Diadlo commented Mar 6, 2017 •

edited

Loading

yurivict commented Mar 27, 2017 •

edited

Loading

nurupo commented Dec 27, 2017 •

edited

Loading