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

HPCC-17110 Jsocket appendv4range properly handles dash chars #9626

Conversation

@rpastrana
Copy link
Member

commented Feb 21, 2017

  • Verifies dashes only appear in 4th octet of IPv4 formatted ip address

Signed-off-by: Rodrigo Pastrana rodrigo.pastrana@lexisnexis.com

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browers
    • The component(s) render as expected

Testing:

- Verifies dashes only appear in 4th octet of IPv4 formatted ip address

Signed-off-by: Rodrigo Pastrana <rodrigo.pastrana@lexisnexis.com>
@hpcc-jirabot

This comment has been minimized.

Copy link

commented Feb 21, 2017

@rpastrana

This comment has been minimized.

Copy link
Member Author

commented Feb 21, 2017

@afishbeck please review.

Copy link
Member

left a comment

This existing routine over all could use some readability improvements, but I think your changes are OK.

else if (*s=='-')
{
if (!notip && dc==3 )//don't assume '-' is an ip range delimiter
{ //also, IP range is only supported in 4rth octet

This comment has been minimized.

Copy link
@richardkchapman

richardkchapman Feb 22, 2017

Member

Typo in comment should be 4th

- Fixes incorrect spelling in comment

Signed-off-by: Rodrigo Pastrana <rodrigo.pastrana@lexisnexis.com>
@rpastrana

This comment has been minimized.

Copy link
Member Author

commented Feb 22, 2017

@richardkchapman typo corrected. Ready to merge.

@HPCCSmoketest

This comment has been minimized.

Copy link
Contributor

commented Feb 22, 2017

Automated Smoketest:
Sha: 068f709
Build: success
ECL Watch: Rebuilding Site

errors warnings build time
0 65 93.093 seconds

Install hpccsystems-platform-community_6.3.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 86 86 0 0 0
wutoolTest(Dali) 19 19 0 0 0
wutoolTest(Cassandra) 19 19 0 0 0

HPCC Stop: OK
HPCC Uninstall: OK

@richardkchapman richardkchapman merged commit 0309e71 into hpcc-systems:candidate-6.4.0 Feb 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.