Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
9be43548
Commit
9be43548
authored
Nov 12, 2010
by
Mike Hibler
Browse files
Fix for JOIN vs JOINv2.
I was using v2 fields even when I got a v1 reply.
parent
61c802a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
os/frisbee.redux/client.c
View file @
9be43548
...
...
@@ -1493,7 +1493,7 @@ PlayFrisbee(void)
if
(
!
nodecompress
)
{
subtype
=
p
->
hdr
.
subtype
=
PKTSUBTYPE_JOIN
;
p
->
hdr
.
datalen
=
sizeof
(
p
->
msg
.
join
);
p
->
msg
.
join
2
.
clientid
=
myid
;
p
->
msg
.
join
.
clientid
=
myid
;
}
else
{
subtype
=
p
->
hdr
.
subtype
=
PKTSUBTYPE_JOIN2
;
p
->
hdr
.
datalen
=
sizeof
(
p
->
msg
.
join2
);
...
...
@@ -1514,6 +1514,12 @@ PlayFrisbee(void)
if
(
PacketReceive
(
p
)
==
0
&&
p
->
hdr
.
subtype
==
subtype
&&
p
->
hdr
.
type
==
PKTTYPE_REPLY
)
{
if
(
subtype
==
PKTSUBTYPE_JOIN
)
{
p
->
msg
.
join2
.
chunksize
=
MAXCHUNKSIZE
;
p
->
msg
.
join2
.
blocksize
=
MAXBLOCKSIZE
;
p
->
msg
.
join2
.
bytecount
=
p
->
msg
.
join
.
blockcount
*
MAXBLOCKSIZE
;
}
CLEVENT
(
1
,
EV_CLIJOINREP
,
CHUNKSIZE
,
BLOCKSIZE
,
(
p
->
msg
.
join2
.
bytecount
>>
32
),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment