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.

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

IPv6 support #22

Merged
merged 33 commits into from May 2, 2016
Merged

IPv6 support #22

merged 33 commits into from May 2, 2016

Conversation

MatthiasKreileder
Copy link
Contributor

Work in progress. Do not merge!

MatthiasKreileder and others added 18 commits March 25, 2016 22:53
…6 (work in progress, not finished, not even runnable)
…e resolution (i.e. specify if IPv4 or IPv6 or both are acceptable
…e Socket. Client side is working but only if the dynamically allocated addresses are not deleted from the heap, which needs to be fixed of course.
@czechboy0 czechboy0 changed the title Add IPv6 support [WIP] Add IPv6 support Apr 25, 2016
@czechboy0
Copy link
Collaborator

Nice! Please merge master into this branch, there seem to be conflicts

private static func getAddressFromHostname(hostname: String) throws -> in_addr {
private func resolveHostnameAndServiceToIPAddresses(socketConfig : SocketConfig,
internetAddress : Internet_Address) throws
-> Array<ResolvedInternetAddress>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Array<ResolvedInternetAddress> -> [ResolvedInternetAddress]


let resolvedInternetAddressList = resolver.resolve(internetAddress: address)

guard resolvedInternetAddressList.count != 0 else {throw Error(.IPAddressValidationFailed) }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isEmpty

@czechboy0
Copy link
Collaborator

🎉

@czechboy0 czechboy0 mentioned this pull request Apr 26, 2016
@czechboy0 czechboy0 changed the title [WIP] Add IPv6 support [WIP] IPv6 support Apr 26, 2016
MatthiasKreileder and others added 7 commits April 27, 2016 00:05
…nternetSocket, because we want to keep RawSocket as dump as possible
…between function parameter name and colon, deleting code that is disabled via commenting it.
…ging the SocksCore Examples: Demonstrate how to use the new static function for SocketConfig
…code for addresses, because those two were changed almost entirely during adding the IPv6 support.
@czechboy0 czechboy0 changed the title [WIP] IPv6 support IPv6 support May 2, 2016
@czechboy0
Copy link
Collaborator

Merging, amazing work @MatthiasKreileder, thanks! 🎉

@czechboy0 czechboy0 merged commit 5d104d4 into master May 2, 2016
@czechboy0 czechboy0 deleted the addIPv6Support branch May 2, 2016 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants