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

fix SOCKS5 username\password set. fix SOCKS5 request #927

Closed
wants to merge 5 commits into
base: master
from

Conversation

Projects
None yet
2 participants
@yzhivik
Contributor

yzhivik commented Aug 23, 2018

  • If you are contributing a new feature, is your work based off the develop branch?
  • If you are contributing a bugfix, is your work based off the fixes branch?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you successfully run make test with your changes locally?
  • Have you signed the Eclipse Contributor Agreement, using the same email address as you used in your commits?
  • Do each of your commits have a "Signed-off-by" line, with the correct email address? Use "git commit -s" to generate this line for you.

@ralight

This comment has been minimized.

Show comment
Hide comment
@ralight

ralight Aug 31, 2018

Contributor

Hello, thank you for your contribution. It looks like this is a worthwhile thing to include, but needs some work first.

Please split the separate issues into separate commits.
Please fix the formatting style to match the existing code.
Please try to remove the duplicate code from the ipv4/ipv6/domain section where possible.
Please complete the list of checkboxes in the original PR comment.

Contributor

ralight commented Aug 31, 2018

Hello, thank you for your contribution. It looks like this is a worthwhile thing to include, but needs some work first.

Please split the separate issues into separate commits.
Please fix the formatting style to match the existing code.
Please try to remove the duplicate code from the ipv4/ipv6/domain section where possible.
Please complete the list of checkboxes in the original PR comment.

@ralight ralight added this to the 1.5.2 milestone Aug 31, 2018

yzhivik added some commits Aug 31, 2018

fix SOCKS5 username and password set
Signed-off-by: yzhivik <yuriy.zhyvytsya@gmail.com>
fix SOCKS5 request wrt IP4/IP6/FQDN
Signed-off-by: yzhivik <yuriy.zhyvytsya@gmail.com>
Merge branch 'master' of https://github.com/yzhivik/mosquitto
Signed-off-by: yzhivik <yuriy.zhyvytsya@gmail.com>

Conflicts:
	lib/socks_mosq.c
fix coding style
Signed-off-by: yzhivik <yuriy.zhyvytsya@gmail.com>
@yzhivik

This comment has been minimized.

Show comment
Hide comment
@yzhivik

yzhivik Aug 31, 2018

Contributor

@ralight Hello, fixed, please review

Contributor

yzhivik commented Aug 31, 2018

@ralight Hello, fixed, please review

ralight added a commit that referenced this pull request Sep 18, 2018

@ralight

This comment has been minimized.

Show comment
Hide comment
@ralight

ralight Sep 18, 2018

Contributor

I've ended up squashing your work into a single commit to avoid the reformatting fixes (for future reference, it's better to replace the original commits in your PR than add new ones on the end). This is now merged through the command line, so I'm going to close this. Thanks very much for your work!

Contributor

ralight commented Sep 18, 2018

I've ended up squashing your work into a single commit to avoid the reformatting fixes (for future reference, it's better to replace the original commits in your PR than add new ones on the end). This is now merged through the command line, so I'm going to close this. Thanks very much for your work!

@ralight ralight closed this Sep 18, 2018

@yzhivik

This comment has been minimized.

Show comment
Hide comment
@yzhivik

yzhivik Sep 18, 2018

Contributor

@ralight
Thanks for pulling in!
I have local changes for:

  1. PKCS12 container grinder (keys, certs and CAs)
  2. Fix for TLS/SSL over proxy, lib tries to make secure connection with socks proxy instead of broker.
    (This fix can be extended to distinguish or combine secured connection to broker or proxy or both)
    WDYT?
Contributor

yzhivik commented Sep 18, 2018

@ralight
Thanks for pulling in!
I have local changes for:

  1. PKCS12 container grinder (keys, certs and CAs)
  2. Fix for TLS/SSL over proxy, lib tries to make secure connection with socks proxy instead of broker.
    (This fix can be extended to distinguish or combine secured connection to broker or proxy or both)
    WDYT?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment