support SO_BINDTODEVICE and bind client_host#3179
Merged
chenBright merged 6 commits intoapache:masterfrom Jan 26, 2026
Merged
Conversation
wenjiecn
force-pushed
the
bind_client_ip
branch
from
2571ebd to
2578b05
Compare
Contributor
|
The unit test is broken, please fix. |
wwbmmm
reviewed
Dec 26, 2025
There was a problem hiding this comment.
Pull request overview
This PR adds support for binding client sockets to a specific IP address or hostname before connecting to a server, addressing issue #3157. The feature allows users to control which local network interface is used for outgoing connections.
- Adds
client_hostfield toChannelOptionsfor user configuration - Propagates client endpoint information through
SocketOptions,GetNamingServiceThreadOptions, and channel signature computation - Implements socket binding in
Socket::Connect()to bind the client socket to the specified IP before connecting
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 12 comments.
Show a summary per file
| File | Description |
|---|---|
| src/brpc/channel.h | Adds client_host string field to ChannelOptions for specifying client IP/hostname |
| src/brpc/channel.cpp | Implements parsing of client_host to EndPoint and includes it in channel signature; handles both InitSingle and Init paths |
| src/brpc/socket.h | Adds local_side field to SocketOptions to store the client endpoint |
| src/brpc/socket.cpp | Implements bind() call in Connect() to bind socket to client IP; initializes local_side from options |
| src/brpc/socket_map.h | Updates function signatures to accept client_end_point parameter |
| src/brpc/socket_map.cpp | Passes client_end_point through to SocketOptions when creating sockets |
| src/brpc/details/naming_service_thread.h | Adds client_end_point field to GetNamingServiceThreadOptions |
| src/brpc/details/naming_service_thread.cpp | Passes client_end_point to SocketMapInsert when adding servers |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
wenjiecn
force-pushed
the
bind_client_ip
branch
from
11468f5 to
8bd8610
Compare
wenjiecn
force-pushed
the
bind_client_ip
branch
from
8bd8610 to
4aac92d
Compare
This was
linked to
issues
Dec 27, 2025
Closed
Contributor
|
Please add some unit tests for this feature. |
wenjiecn
force-pushed
the
bind_client_ip
branch
from
8a2dc92 to
1bff8cb
Compare
Contributor
Author
@chenBright done |
Contributor
|
LGTM |
This was referenced Dec 30, 2025
Closed
372046933
reviewed
Jan 4, 2026
wenjiecn
force-pushed
the
bind_client_ip
branch
2 times, most recently
from
6cb6396 to
c1c6e1a
Compare
wenjiecn
force-pushed
the
bind_client_ip
branch
from
c1c6e1a to
8650f00
Compare
372046933
reviewed
Jan 5, 2026
| // We need to do async connect (to manage the timeout by ourselves). | ||
| CHECK_EQ(0, butil::make_non_blocking(sockfd)); | ||
|
|
||
| if (!_device_name.empty()) { |
Contributor
There was a problem hiding this comment.
不是很确定 #3157 需要的是指定source IP，还是指定网络设备。如果只需要指定source IP, 之前的bind可以满足需求。这里要不要把之前的那个client_host选项一并加进来？
Contributor
Author
There was a problem hiding this comment.
确实可以加进来，让网络配置更精细化，我有空合并一下
wenjiecn
changed the title
wenjiecn
changed the title
Contributor
@wwbmmm 大佬，可以合并了吗？ |
chenBright
reviewed
Jan 14, 2026
wenjiecn
force-pushed
the
bind_client_ip
branch
from
6d77bb9 to
ec6d269
Compare
wenjiecn
force-pushed
the
bind_client_ip
branch
from
ec6d269 to
46b8adf
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: #3157, #3178
Problem Summary:
What is changed and the side effects?
Changed:
1.在ChannelOptions中添加client_host和device_name，让用户设置client的ip或hostname和网卡名称
2.在SocketOptions 中添加butil::EndPoint local_side，由 client_host:0 -> local_side
3.在GetNamingServiceThreadOptions添加butil::EndPoint client_end_point，由 client_host:0 -> client_end_point
4.在ComputeChannelSignature中append "clih=client_host", 进行hash
5.在系统调用socket创建socket后，调用bind绑定ip以及绑定网卡
Side effects:
Performance effects:
Breaking backward compatibility:
Check List: