Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
1bfe6356
Commit
1bfe6356
authored
9 years ago
by
Joakim Nohlgård
Browse files
Options
Downloads
Plain Diff
Merge pull request #3435 from gebart/pr/iphc-mcast-8bit
ng_sixlopan_iphc: Multicast decoding 8-bit fix and build fix
parents
50b8b8f6
f15a5391
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
+5
-4
5 additions, 4 deletions
sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
with
5 additions
and
4 deletions
sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
+
5
−
4
View file @
1bfe6356
...
...
@@ -329,10 +329,10 @@ bool ng_sixlowpan_iphc_decode(ng_pktsnip_t *pkt)
break
;
case
IPHC_M_DAC_DAM_M_8
:
/* ff
XX
::XX: */
/* ff
02
::XX: */
ng_ipv6_addr_set_unspecified
(
&
ipv6_hdr
->
dst
);
ipv6_hdr
->
dst
.
u8
[
0
]
=
0xff
;
ipv6_hdr
->
dst
.
u8
[
1
]
=
iphc_hdr
[
payload_offset
++
]
;
ipv6_hdr
->
dst
.
u8
[
1
]
=
0x02
;
ipv6_hdr
->
dst
.
u8
[
15
]
=
iphc_hdr
[
payload_offset
++
];
break
;
...
...
@@ -499,7 +499,8 @@ bool ng_sixlowpan_iphc_encode(ng_pktsnip_t *pkt)
}
if
((
src_ctx
!=
NULL
)
||
ng_ipv6_addr_is_link_local
(
&
(
ipv6_hdr
->
src
)))
{
eui64_t
iid
=
{
0
};
eui64_t
iid
;
iid
.
uint64
.
u64
=
0
;
if
((
netif_hdr
->
src_l2addr_len
==
2
)
||
(
netif_hdr
->
src_l2addr_len
==
4
)
||
...
...
@@ -556,7 +557,7 @@ bool ng_sixlowpan_iphc_encode(ng_pktsnip_t *pkt)
(
ipv6_hdr
->
dst
.
u32
[
1
].
u32
==
0
)
&&
(
ipv6_hdr
->
dst
.
u16
[
4
].
u16
==
0
))
{
/* if multicast address is of format ff02::XX */
if
((
ipv6_hdr
->
dst
.
u8
[
1
]
==
2
)
&&
if
((
ipv6_hdr
->
dst
.
u8
[
1
]
==
0x0
2
)
&&
(
ipv6_hdr
->
dst
.
u32
[
2
].
u32
==
0
)
&&
(
ipv6_hdr
->
dst
.
u16
[
6
].
u16
==
0
)
&&
(
ipv6_hdr
->
dst
.
u8
[
14
]
==
0
))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment