Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move system header includes from network.h to network.c #822

Merged
merged 1 commit into from
May 20, 2018
Merged

Move system header includes from network.h to network.c #822

merged 1 commit into from
May 20, 2018

Conversation

iphydf
Copy link
Member

@iphydf iphydf commented Feb 27, 2018 •
edited
Loading

This change is Reviewable

@iphydf iphydf added this to the v0.2.x milestone Feb 27, 2018
@iphydf iphydf force-pushed the hide-network-includes branch 4 times, most recently from 494c64d to 0971d3b Compare February 27, 2018 02:08
@iphydf iphydf changed the title WIP: Move system header includes from network.h to network.c Move system header includes from network.h to network.c Feb 27, 2018
@iphydf iphydf force-pushed the hide-network-includes branch 7 times, most recently from 7d246b0 to 1ed247f Compare February 27, 2018 06:06
@nurupo
Copy link
Member

nurupo commented Feb 27, 2018

This looks like something that might be worth testing on all CI configurations once this is ready for merge, as we had quite the trouble with all those OS-specific network includes before.

@iphydf
Copy link
Member Author

iphydf commented Feb 27, 2018

Yes, I will do that once 0.2.0 is released.

@iphydf iphydf modified the milestones: v0.2.1, v0.2.x Mar 9, 2018
@iphydf iphydf force-pushed the hide-network-includes branch 6 times, most recently from 769fc02 to e82b21a Compare March 16, 2018 02:37
@iphydf
Copy link
Member Author

iphydf commented Mar 16, 2018

@nurupo done.

@iphydf iphydf force-pushed the hide-network-includes branch 2 times, most recently from 73ed2e7 to bd78346 Compare March 16, 2018 03:10
@iphydf
Copy link
Member Author

iphydf commented Mar 16, 2018

https://travis-ci.org/TokTok/c-toxcore/builds/354138261

@iphydf iphydf force-pushed the hide-network-includes branch 2 times, most recently from cd45eac to 01f974c Compare March 16, 2018 03:17
@iphydf iphydf force-pushed the hide-network-includes branch 3 times, most recently from feb00f6 to 006e4bd Compare March 18, 2018 04:58
@iphydf iphydf requested a review from a team April 3, 2018 17:48
@sudden6
Copy link

sudden6 commented Apr 3, 2018

Reviewed 33 of 34 files at r1.
Review status: 30 of 34 files reviewed at latest revision, all discussions resolved.

toxcore/network.c, line 64 at r1 (raw file):

#include <winsock2.h>

#include <windows.h>

add a guard comment like above?

toxcore/TCP_server.c, line 251 at r1 (raw file):

uint16_t read_TCP_length(Socket sock)
{
    unsigned int count = net_socket_data_recv_buffer(sock);

const

Comments from Reviewable

@iphydf iphydf force-pushed the hide-network-includes branch 2 times, most recently from 71fa12c to 9e4570a Compare May 20, 2018 13:29
@iphydf
Copy link
Member Author

iphydf commented May 20, 2018

Review status: 25 of 34 files reviewed at latest revision, 2 unresolved discussions.

toxcore/network.c, line 64 at r1 (raw file):

Previously, sudden6 wrote…

add a guard comment like above?

Done.

toxcore/TCP_server.c, line 251 at r1 (raw file):

Previously, sudden6 wrote…

const

Done.

Comments from Reviewable

@sudden6
Copy link

sudden6 commented May 20, 2018

:lgtm_strong:

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

Comments from Reviewable

@iphydf iphydf modified the milestones: v0.2.x, v0.2.3 May 20, 2018
@iphydf iphydf merged commit be797d4 into TokTok:master May 20, 2018
@iphydf iphydf deleted the hide-network-includes branch May 20, 2018 16:00
iphydf added a commit to iphydf/c-toxcore that referenced this pull request Sep 5, 2018
@iphydf
Merge tag 'v0.2.3' into ngc_rebase
710f957 
v0.2.3
**Merged PRs:**

- [TokTok#951] Only run astyle if the astyle binary exists.
- [TokTok#950] Remove utils.c and utils.h from toxencryptsave build.
- [TokTok#949] Fixes to the imported sodium sources to compile without warnings.
- [TokTok#948] Add a MAX_HOSTNAME_LENGTH constant.
- [TokTok#947] Remove the format test.
- [TokTok#937] Add new Circle CI configuration.
- [TokTok#935] Add a test for double conference invite.
- [TokTok#933] Add Logger to various net_crypto functions, and add `const` to Logger where possible.
- [TokTok#931] Avoid conditional-uninitialised warning for tcp test.
- [TokTok#930] Disable UDP when proxy is enabled.
- [TokTok#928] Use clang-format for C++ code.
- [TokTok#927] Add assertions to bootstrap tests for correct connection type.
- [TokTok#926] Make NULL options behave the same as default options.
- [TokTok#925] Add tests for what happens when passing an invalid proxy host.
- [TokTok#924] Make the net_crypto connection state an enum.
- [TokTok#922] Clarify/Improve test_some test
- [TokTok#921] Beginnings of a TCP_test.c overhaul
- [TokTok#920] Add test for creating multiple conferences in one tox.
- [TokTok#918] Merge irungentoo/master into toktok
- [TokTok#917] Add random testing program.
- [TokTok#916] Fix linking with address sanitizer.
- [TokTok#915] Remove resource_leak_test.
- [TokTok#914] Make dht_test more stable.
- [TokTok#913] Minor cleanup: return early on error condition.
- [TokTok#906] Sort bazel build file according to buildifier standard.
- [TokTok#905] In DEBUG mode, make toxcore crash on signed integer overflow.
- [TokTok#902] Log only the filename, not the full path in LOGGER.
- [TokTok#899] Fix macOS macro because of GNU Mach
- [TokTok#898] Fix enumeration of Crypto_Connection instances
- [TokTok#897] Fix ipport_isset: port 0 is not a valid port.
- [TokTok#894] Fix logging related crash in bootstrap node
- [TokTok#893] Fix bootstrap crashes, still
- [TokTok#892] Add empty logger to DHT bootstrap daemons.
- [TokTok#887] Fix FreeBSD build on Travis
- [TokTok#884] Fix the often call of event tox_friend_connection_status
- [TokTok#883] Make toxcore compile on BSD
- [TokTok#878] fix DHT_bootstrap key loading
- [TokTok#877] Add minitox to under "Other resources" section in the README
- [TokTok#875] Make bootstrap daemon use toxcore's version
- [TokTok#867] Improve network error reporting on Windows
- [TokTok#841] Only check full rtp offset if RTP_LARGE_FRAME is set
- [TokTok#823] Finish @Diadlo's network Family abstraction.
- [TokTok#822] Move system header includes from network.h to network.c
iphydf added a commit to iphydf/c-toxcore that referenced this pull request Sep 5, 2018
@iphydf
Merge tag 'v0.2.3' into ngc_rebase
5aa5604 
v0.2.3
**Merged PRs:**

- [TokTok#951] Only run astyle if the astyle binary exists.
- [TokTok#950] Remove utils.c and utils.h from toxencryptsave build.
- [TokTok#949] Fixes to the imported sodium sources to compile without warnings.
- [TokTok#948] Add a MAX_HOSTNAME_LENGTH constant.
- [TokTok#947] Remove the format test.
- [TokTok#937] Add new Circle CI configuration.
- [TokTok#935] Add a test for double conference invite.
- [TokTok#933] Add Logger to various net_crypto functions, and add `const` to Logger where possible.
- [TokTok#931] Avoid conditional-uninitialised warning for tcp test.
- [TokTok#930] Disable UDP when proxy is enabled.
- [TokTok#928] Use clang-format for C++ code.
- [TokTok#927] Add assertions to bootstrap tests for correct connection type.
- [TokTok#926] Make NULL options behave the same as default options.
- [TokTok#925] Add tests for what happens when passing an invalid proxy host.
- [TokTok#924] Make the net_crypto connection state an enum.
- [TokTok#922] Clarify/Improve test_some test
- [TokTok#921] Beginnings of a TCP_test.c overhaul
- [TokTok#920] Add test for creating multiple conferences in one tox.
- [TokTok#918] Merge irungentoo/master into toktok
- [TokTok#917] Add random testing program.
- [TokTok#916] Fix linking with address sanitizer.
- [TokTok#915] Remove resource_leak_test.
- [TokTok#914] Make dht_test more stable.
- [TokTok#913] Minor cleanup: return early on error condition.
- [TokTok#906] Sort bazel build file according to buildifier standard.
- [TokTok#905] In DEBUG mode, make toxcore crash on signed integer overflow.
- [TokTok#902] Log only the filename, not the full path in LOGGER.
- [TokTok#899] Fix macOS macro because of GNU Mach
- [TokTok#898] Fix enumeration of Crypto_Connection instances
- [TokTok#897] Fix ipport_isset: port 0 is not a valid port.
- [TokTok#894] Fix logging related crash in bootstrap node
- [TokTok#893] Fix bootstrap crashes, still
- [TokTok#892] Add empty logger to DHT bootstrap daemons.
- [TokTok#887] Fix FreeBSD build on Travis
- [TokTok#884] Fix the often call of event tox_friend_connection_status
- [TokTok#883] Make toxcore compile on BSD
- [TokTok#878] fix DHT_bootstrap key loading
- [TokTok#877] Add minitox to under "Other resources" section in the README
- [TokTok#875] Make bootstrap daemon use toxcore's version
- [TokTok#867] Improve network error reporting on Windows
- [TokTok#841] Only check full rtp offset if RTP_LARGE_FRAME is set
- [TokTok#823] Finish @Diadlo's network Family abstraction.
- [TokTok#822] Move system header includes from network.h to network.c
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v0.2.3
Development

Successfully merging this pull request may close these issues.
3 participants
@iphydf @nurupo @sudden6