josh/jrouter
josh/jrouter
1
0
Fork 0
Code Issues 10 Pull requests Releases Activity

aurp: Control extendedness of tuples

Browse source
This commit is contained in:
Josh Deprez 2024-04-06 16:06:32 +11:00
parent acf8400f47
commit fc5b07b975
Signed by: josh
SSH key fingerprint: SHA256:zZji7w1Ilh2RuUpbQcqkLPrqmRwpiCSycbF2EfKm6Kw
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aurp/routing_info.go
View file

@ -114,6 +114,7 @@ func parseNetworkTuples(p []byte) (NetworkTuples, error) {
} }
type NetworkTuple struct { type NetworkTuple struct {
Extended bool
RangeStart uint16 RangeStart uint16
Distance uint8 Distance uint8
RangeEnd uint16 RangeEnd uint16
@ -123,7 +124,7 @@ type NetworkTuple struct {
func (nt *NetworkTuple) WriteTo(w io.Writer) (int64, error) { func (nt *NetworkTuple) WriteTo(w io.Writer) (int64, error) {
a := acc(w) a := acc(w)
a.write16(nt.RangeStart) a.write16(nt.RangeStart)
if nt.RangeStart == nt.RangeEnd { if !nt.Extended {
// non-extended tuple // non-extended tuple
a.write8(nt.Distance) a.write8(nt.Distance)
return a.ret() return a.ret()
@ -144,8 +145,9 @@ func parseNetworkTuple(p []byte) (NetworkTuple, []byte, error) {
nt.RangeStart = binary.BigEndian.Uint16(p[:2]) nt.RangeStart = binary.BigEndian.Uint16(p[:2])
nt.RangeEnd = nt.RangeStart nt.RangeEnd = nt.RangeStart
nt.Distance = p[2] nt.Distance = p[2]
nt.Extended = nt.Distance&0x80 != 0
if nt.Distance&0x80 == 0 { if !nt.Extended {
return nt, p[3:], nil return nt, p[3:], nil
} }
@ -185,6 +187,7 @@ func parseEventTuples(p []byte) (EventTuples, error) {
type EventTuple struct { type EventTuple struct {
EventCode EventCode EventCode EventCode
Extended bool
RangeStart uint16 RangeStart uint16
Distance uint8 Distance uint8
RangeEnd uint16 RangeEnd uint16
@ -194,7 +197,7 @@ func (et *EventTuple) WriteTo(w io.Writer) (int64, error) {
a := acc(w) a := acc(w)
a.write8(uint8(et.EventCode)) a.write8(uint8(et.EventCode))
a.write16(et.RangeStart) a.write16(et.RangeStart)
if et.RangeStart == et.RangeEnd { if !et.Extended {
// non-extended tuple // non-extended tuple
a.write8(et.Distance) a.write8(et.Distance)
return a.ret() return a.ret()
@ -215,8 +218,9 @@ func parseEventTuple(p []byte) (EventTuple, []byte, error) {
et.RangeStart = binary.BigEndian.Uint16(p[1:3]) et.RangeStart = binary.BigEndian.Uint16(p[1:3])
et.RangeEnd = et.RangeStart et.RangeEnd = et.RangeStart
et.Distance = p[3] et.Distance = p[3]
et.Extended = et.Distance&0x80 != 0
if et.Distance&0x80 == 0 { if !et.Extended {
return et, p[4:], nil return et, p[4:], nil
} }

1
peer.go
View file

@ -255,6 +255,7 @@ func (p *peer) handle(ctx context.Context) error {
nets := aurp.NetworkTuples{ nets := aurp.NetworkTuples{
{ {
Extended: true,
RangeStart: p.cfg.EtherTalk.NetStart, RangeStart: p.cfg.EtherTalk.NetStart,
RangeEnd: p.cfg.EtherTalk.NetEnd, RangeEnd: p.cfg.EtherTalk.NetEnd,
Distance: 0, Distance: 0,