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

[DHCP relay]: Fix bug which could cause incorrect interface name association #1233

Merged
merged 4 commits into from
Dec 13, 2017
Merged

[DHCP relay]: Fix bug which could cause incorrect interface name association #1233

merged 4 commits into from
Dec 13, 2017

Conversation

jleveque
Copy link
Contributor

  • Fix bug where "name" field of interface_info struct was improperly getting overwritten in _bridgefdbquery(). Under certain circumstances (like upon receiving a unicast DHCP renewal message), the stored interface's name could be overwritten by a different interface's name, breaking the relay agent's ability to properly relay packets for the remainder of the process' lifetime.

  • Unrelated changes:

    • No longer writing circuit id and remote id to interface_info struct. This will cause find_interface_by_agent_option() to fail unless the circuit ID is the name of the interface. However, in the case of a bridge interface, multiple circuit IDs should potentially match. In order to properly support this, a future patch could be created to define remote_id as a char array and circuit_id as an array of char arrays, which could hold multiple circuit IDs.
    • Minor cleanup and tweaks to buffer sizes and some logic to ensure consistent behavior. Although they were not causing problems now, they could have potentially done so in the future
    • Removed whitespace from empty lines
    • Separate patch into a series of more atomic patches
    • Generate series of patch files using git format-patch and apply using git am instead of diff -ruN/patch -p1 to align with most other patch generation/application in the SONiC project, which use git apply.

@jleveque jleveque self-assigned this Dec 12, 2017
@jleveque jleveque mentioned this pull request Dec 12, 2017
Closed
@lguohan
Copy link
Collaborator

lguohan commented Dec 12, 2017

in case of series of patch, we usually use the series file to define the patch sequence.

check here. https://raw.githubusercontent.com/Azure/sonic-linux-kernel/master/Makefile

lguohan
lguohan reviewed Dec 12, 2017
View reviewed changes
Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

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

prefer to have a series file to define the patch order

@lguohan lguohan merged commit 2571cb5 into sonic-net:master Dec 13, 2017
@jleveque jleveque deleted the dhcp_relay_fix2 branch December 13, 2017 17:24
@jleveque jleveque mentioned this pull request Dec 18, 2017
Merged
@dzhangalibaba dzhangalibaba mentioned this pull request Apr 20, 2020
Merged
@judyjoseph judyjoseph mentioned this pull request Apr 25, 2020
Merged
@jleveque jleveque mentioned this pull request Nov 15, 2020
Merged
jleveque added a commit that referenced this pull request Nov 25, 2020
@jleveque
[sonic-utilities] Update submodule; Build and install as a Python 3 w…
7f4ab8f 
…heel (#5926)

Submodule updates include the following commits:

* src/sonic-utilities 9dc58ea...f9eb739 (18):
  > Remove unnecessary calls to str.encode() now that the package is Python 3; Fix deprecation warning (#1260)
  > [generate_dump] Ignoring file/directory not found Errors (#1201)
  > Fixed porstat rate and util issues (#1140)
  > fix error: interface counters is mismatch after warm-reboot (#1099)
  > Remove unnecessary calls to str.decode() now that the package is Python 3 (#1255)
  > [acl-loader] Make list sorting compliant with Python 3 (#1257)
  > Replace hard-coded fast-reboot with variable. And some typo corrections (#1254)
  > [configlet][portconfig] Remove calls to dict.has_key() which is not available in Python 3 (#1247)
  > Remove unnecessary conversions to list() and calls to dict.keys() (#1243)
  > Clean up LGTM alerts (#1239)
  > Add 'requests' as install dependency in setup.py (#1240)
  > Convert to Python 3 (#1128)
  > Fix mock SonicV2Connector in python3: use decode_responses mode so caller code will be the same as python2 (#1238)
  > [tests] Do not trim from PATH if we did not append to it; Clean up/fix shebangs in scripts (#1233)
  > Updates to bgp config and show commands with BGP_INTERNAL_NEIGHBOR table (#1224)
  > [cli]: NAT show commands newline issue after migrated to Python3 (#1204)
  > [doc]: Update Command-Reference.md (#1231)
  > Added 'import sys' in feature.py file (#1232)

* src/sonic-py-swsssdk 9d9f0c6...1664be9 (2):
  > Fix: no need to decode() after redis client scan, so it will work for both python2 and python3 (#96)
  > FieldValueMap `contains`(`in`)  will also work when migrated to libswsscommon(C++ with SWIG wrapper) (#94)

- Also fix Python 3-related issues:
    - Use integer (floor) division in config_samples.py (sonic-config-engine)
    - Replace print statement with print function in eeprom.py plugin for x86_64-kvm_x86_64-r0 platform
    - Update all platform plugins to be compatible with both Python 2 and Python 3
    - Remove shebangs from plugins files which are not intended to be executable
    - Replace tabs with spaces in Python plugin files and fix alignment, because Python 3 is more strict
    - Remove trailing whitespace from plugins files
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
@jleveque @santhosh-kt
[sonic-utilities] Update submodule; Build and install as a Python 3 w…
8d48e6f 
…heel (sonic-net#5926)

Submodule updates include the following commits:

* src/sonic-utilities 9dc58ea...f9eb739 (18):
  > Remove unnecessary calls to str.encode() now that the package is Python 3; Fix deprecation warning (sonic-net#1260)
  > [generate_dump] Ignoring file/directory not found Errors (sonic-net#1201)
  > Fixed porstat rate and util issues (sonic-net#1140)
  > fix error: interface counters is mismatch after warm-reboot (sonic-net#1099)
  > Remove unnecessary calls to str.decode() now that the package is Python 3 (sonic-net#1255)
  > [acl-loader] Make list sorting compliant with Python 3 (sonic-net#1257)
  > Replace hard-coded fast-reboot with variable. And some typo corrections (sonic-net#1254)
  > [configlet][portconfig] Remove calls to dict.has_key() which is not available in Python 3 (sonic-net#1247)
  > Remove unnecessary conversions to list() and calls to dict.keys() (sonic-net#1243)
  > Clean up LGTM alerts (sonic-net#1239)
  > Add 'requests' as install dependency in setup.py (sonic-net#1240)
  > Convert to Python 3 (sonic-net#1128)
  > Fix mock SonicV2Connector in python3: use decode_responses mode so caller code will be the same as python2 (sonic-net#1238)
  > [tests] Do not trim from PATH if we did not append to it; Clean up/fix shebangs in scripts (sonic-net#1233)
  > Updates to bgp config and show commands with BGP_INTERNAL_NEIGHBOR table (sonic-net#1224)
  > [cli]: NAT show commands newline issue after migrated to Python3 (sonic-net#1204)
  > [doc]: Update Command-Reference.md (sonic-net#1231)
  > Added 'import sys' in feature.py file (sonic-net#1232)

* src/sonic-py-swsssdk 9d9f0c6...1664be9 (2):
  > Fix: no need to decode() after redis client scan, so it will work for both python2 and python3 (sonic-net#96)
  > FieldValueMap `contains`(`in`)  will also work when migrated to libswsscommon(C++ with SWIG wrapper) (sonic-net#94)

- Also fix Python 3-related issues:
    - Use integer (floor) division in config_samples.py (sonic-config-engine)
    - Replace print statement with print function in eeprom.py plugin for x86_64-kvm_x86_64-r0 platform
    - Update all platform plugins to be compatible with both Python 2 and Python 3
    - Remove shebangs from plugins files which are not intended to be executable
    - Replace tabs with spaces in Python plugin files and fix alignment, because Python 3 is more strict
    - Remove trailing whitespace from plugins files
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
@jleveque
[tests] Do not trim from PATH if we did not append to it; Clean up/fi…
71aa221 
…x shebangs in scripts (sonic-net#1233)

Some tests were trimming the last item from system PATH, but they never appended anything to it, thus these tests were trimming valid entries from the tail of the system path, which in turn caused scripts with shebangs like `#!/usr/bin/env python` to fail, because once `/usr/bin` was removed from PATH, `python` could not be found.

**- How I did it**

- Remove lines which trimmed the last entry from system PATH in the teardown function if nothing was appended to PATH in the setup method.
- Remove shebangs from non-executable Python files
- Fix shebangs which had a space in them
- Replace `#!/usr/bin/python` shebangs with the preferred, more portable `#!/usr/bin/env python` in executable scripts
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
@daall
[dvs] Add generic polling utility (sonic-net#1233)
b27d06b 
Signed-off-by: Danny Allen <daall@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan approved these changes

@yxieca yxieca Awaiting requested review from yxieca

Assignees

@jleveque jleveque

Labels
Bug 🐛 DHCP Relay
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jleveque @lguohan