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

fix(netbios): Return interface address for NetBIOS name lookup #9885

Merged
merged 3 commits into from
Jun 18, 2024

Conversation

earlephilhower
Copy link
Contributor

Description of Change

When NetBIOS returns a match, it should return the IP address of the device. Presently, however, it returns the address of multicast IP for the subnet since the incoming NBNS packet's UDP target will be multicast (i.e. 192.168.1.255).

Iterate over the active network interfaces and check netmasks to determine where the packet came from, and return the appropriate IP interface address instead.

Tests scenarios

Without this change, the address returned for NetBIOS lookups is the multicast udpPacket address:

earle@amd:~/Arduino/hardware/espressif/esp32$ nmblookup ESP
192.168.1.255 ESP<00>

With this patch, the actual device address is returned

earle@amd:~/Arduino/hardware/espressif/esp32$ nmblookup ESP
192.168.1.185 ESP<00>

@CLAassistant
Copy link

CLAassistant commented Jun 18, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

github-actions bot commented Jun 18, 2024

Messages
📖 You might consider squashing your 3 commits (simplifying branch history).

👋 Hello earlephilhower, we appreciate your contribution to this project!


Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- Addressing info messages (📖) is strongly recommended; they're less critical but valuable.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests.

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
4. If the change is approved and passes the tests it is merged into the default branch.

Generated by 🚫 dangerJS against 9832cfd

When NetBIOS returns a match, it should return the IP address of the device.
Presently, however, it returns the address of multicast IP for the subnet
since the incoming NBNS packet's UDP target will be multicast
(i.e. 192.168.1.255).

Iterate over the active network interfaces and check netmasks to determine
where the packet came from, and return the appropriate IP interface address
instead.
@earlephilhower earlephilhower changed the title Return interface address for NetBIOS name lookup fix(netbios): Return interface address for NetBIOS name lookup Jun 18, 2024
Copy link
Contributor

Memory usage test (comparing PR against master branch)

The table below shows the summary of memory usage change (decrease - increase) in bytes and percentage for each target.

MemoryFLASH [bytes]FLASH [%]RAM [bytes]RAM [%]
TargetDECINCDECINCDECINCDECINC
ESP32S3000.000.00000.000.00
ESP32S2000.000.00000.000.00
ESP32C3000.000.00000.000.00
ESP32C6000.000.00000.000.00
ESP32000.000.00000.000.00
Click to expand the detailed deltas report [usage change in BYTES]
TargetESP32S3ESP32S2ESP32C3ESP32C6ESP32
ExampleFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAM
NetBIOS/examples/ESP_NBNST----------

Copy link
Contributor

github-actions bot commented Jun 18, 2024

Test Results

 56 files   56 suites   5m 16s ⏱️
 21 tests  21 ✅ 0 💤 0 ❌
135 runs  135 ✅ 0 💤 0 ❌

Results for commit 9832cfd.

♻️ This comment has been updated with latest results.

@me-no-dev
Copy link
Member

Tested Working!

@me-no-dev me-no-dev added the Status: Pending Merge Pull Request is ready to be merged label Jun 18, 2024
@me-no-dev me-no-dev merged commit 6b22339 into espressif:master Jun 18, 2024
38 checks passed
@earlephilhower earlephilhower deleted the nb1 branch June 18, 2024 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Pending Merge Pull Request is ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants