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

[components][sal]修改sal_bind对于协议族的判断 #9413

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

zmshahaha
Copy link
Contributor

拉取/合并请求描述:(PR description)

[

为什么提交这份PR (why to submit this PR)

sal_bind原先是在非UNIX/NETLINK协议族时进入中间的流程,而中间流程将sockaddr解析成sockaddr_in,可知只有在使用互联网协议族才走中间流程。如果需要支持更多协议族则需要在if判断里考虑更多中情况。

你的解决方案是什么 (what is your solution)

将if判断改为判断是否是互联网INET协议族

请提供验证的bsp和config (provide the config and bsp)

  • BSP:
  • .config:
  • action:

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

Copy link
Contributor

@polarvid polarvid left a comment

Choose a reason for hiding this comment

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

感觉 PR 描述有点怪... 这部分功能看代码主要实现的是指定 IP 地址 bind 时对应套接字的网口检验和更新。

@@ -684,7 +684,7 @@ int sal_bind(int socket, const struct sockaddr *name, socklen_t namelen)

addr_un = (struct sockaddr_un *)name;

if ((addr_un->sa_family != AF_UNIX) && (addr_un->sa_family != AF_NETLINK))
if ((name->sa_family == AF_INET) || (name->sa_family == AF_INET6))
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if ((name->sa_family == AF_INET) || (name->sa_family == AF_INET6))
#define IS_INET_ADDR_FMT(_af) ((_af) == AF_INET) || ((_af) == AF_INET6)
if (IS_INET_ADDR_FMT(name->sa_family))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

换了,不过IS_INET_ADDR_FMT我改成IS_INET_ADDR_FAMILY了

@Rbb666 Rbb666 merged commit 992e79a into RT-Thread:master Sep 19, 2024
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants