Skip to content

Enable ipv6 in orchagent #79

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

Merged
lguohan merged 11 commits into from
Sep 14, 2016
Merged

Enable ipv6 in orchagent #79

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
315a4d0
Revert "neighsyncd: Discarding unsupported IPv6 messages"
qiluo-msft Sep 6, 2016
f3981e7
Enable IPv6 for orch
qiluo-msft Sep 7, 2016
a8ec6e9
Refactor
qiluo-msft Sep 7, 2016
4060360
Fix namespace
qiluo-msft Sep 8, 2016
f041802
Rename header file
qiluo-msft Sep 9, 2016
5f8b740
Add namespace
qiluo-msft Sep 9, 2016
27095cd
Remove internal functions
qiluo-msft Sep 9, 2016
6162a47
Replace assert with logic_error exception for better protection in re…
qiluo-msft Sep 9, 2016
012c01d
(fix comment typo)
qiluo-msft Sep 9, 2016
dc8b04b
Merge branch 'master' into qiluo/ipv6
qiluo-msft Sep 14, 2016
3681e98
Fix subnet() mask
qiluo-msft Sep 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions orchagent/swssnet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ inline static sai_ip_prefix_t& subnet(sai_ip_prefix_t& dst, const sai_ip_prefix_
{
case SAI_IP_ADDR_FAMILY_IPV4:
dst.addr.ip4 = src.addr.ip4 & src.mask.ip4;
dst.mask.ip4 = 0xFFFFFFFF;
dst.mask.ip4 = src.mask.ip4;
break;
case SAI_IP_ADDR_FAMILY_IPV6:
for (size_t i = 0; i < 16; i++)
{
dst.addr.ip6[i] = src.addr.ip6[i] & src.mask.ip6[i];
dst.mask.ip6[i] = 0xFF;
dst.mask.ip6[i] = src.mask.ip6[i];
Copy link
Contributor

@lguohan lguohan Sep 14, 2016

Choose a reason for hiding this comment

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

what's the dst mask then?

Copy link
Contributor Author

@qiluo-msft qiluo-msft Sep 14, 2016

Choose a reason for hiding this comment

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

Resolved. Sorry for the mistake.

}
break;
default:
Expand Down