idk/go-i2p
1
0
Fork 0
mirror of https://github.com/go-i2p/go-i2p.git synced 2025-07-04 05:26:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

message id parsing

Browse Source
This commit is contained in:
Hayden Parker
2016-11-06 15:04:43 -08:00
parent abd08057f3
commit d82edd84a2
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/tunnel/delivery.go
View File

@ -630,7 +630,29 @@ func maybeAppendDelay(di_flag DeliveryInstructions, data, current []byte) (now [
} }
func maybeAppendMessageID(di_flag DeliveryInstructions, di_type int, data, current []byte) (now []byte, err error) { func maybeAppendMessageID(di_flag DeliveryInstructions, di_type int, data, current []byte) (now []byte, err error) {
if di_type == FIRST_FRAGMENT { if di_type == FIRST_FRAGMENT {
if fragmented, _ := di_flag.Fragmented(); fragmented {
message_id_index := 1
if dtype, _ := di_flag.DeliveryType(); dtype == DT_TUNNEL {
message_id_index += 4
}
if dtype, _ := di_flag.DeliveryType(); dtype == DT_TUNNEL || dtype == DT_ROUTER {
message_id_index += 32
}
if delay, _ := di_flag.HasDelay(); delay {
message_id_index += 1
}
if len(data) < message_id_index+4 {
err = errors.New("data is too short to contain message ID in FIRST_FRAGMENT")
} else {
now = append(current, data[message_id_index:message_id_index+4]...)
}
}
} else if di_type == FOLLOW_ON_FRAGMENT { } else if di_type == FOLLOW_ON_FRAGMENT {
if len(data) < 5 {
err = errors.New("data is too short to contain message ID in FOLLOW_ON_FRAGMENT")
} else {
now = append(current, data[1:5]...)
}
} }
return return
} }
@ -641,12 +663,16 @@ func maybeAppendExtendedOptions(di_flag DeliveryInstructions, data, current []by
func maybeAppendSize(di_flag DeliveryInstructions, di_type int, data, current []byte) (now []byte, err error) { func maybeAppendSize(di_flag DeliveryInstructions, di_type int, data, current []byte) (now []byte, err error) {
if di_type == FIRST_FRAGMENT { if di_type == FIRST_FRAGMENT {
} else if di_type == FOLLOW_ON_FRAGMENT { } else if di_type == FOLLOW_ON_FRAGMENT {
if len(data) < 7 {
err = errors.New("data is too short to contain size data")
} else {
now = append(now, data[5:7]...)
}
} }
return return
} }
//delivery_type, _ := di_flag.DeliveryType() //delivery_type, _ := di_flag.DeliveryType()
//fragmented, _ := di_flag.Fragmented()
//has_tunnel_id, _ := di_flag.HasTunnelID() //has_tunnel_id, _ := di_flag.HasTunnelID()
func readDeliveryInstructions(data []byte) (instructions DeliveryInstructions, remainder []byte, err error) { func readDeliveryInstructions(data []byte) (instructions DeliveryInstructions, remainder []byte, err error) {
@ -697,5 +723,7 @@ func readDeliveryInstructions(data []byte) (instructions DeliveryInstructions, r
} }
} }
remainder = data[len(di_data):]
return return
} }