expanded logging in header.go

This commit is contained in:
Haris Khan
2024-10-18 22:47:28 -04:00
parent 013d35b447
commit be35267079

View File

@@ -2,11 +2,10 @@ package i2np
import (
"errors"
"github.com/sirupsen/logrus"
"time"
datalib "github.com/go-i2p/go-i2p/lib/common/data"
log "github.com/sirupsen/logrus"
)
/*
@@ -95,10 +94,12 @@ var ERR_I2NP_NOT_ENOUGH_DATA = errors.New("not enough i2np header data")
// Read an entire I2NP message and return the parsed header
// with embedded encrypted data
func ReadI2NPNTCPHeader(data []byte) (I2NPNTCPHeader, error) {
log.Debug("Reading I2NP NTCP Header")
header := I2NPNTCPHeader{}
message_type, err := ReadI2NPType(data)
if err != nil {
log.WithError(err).Error("Failed to read I2NP type")
return header, err
} else {
header.Type = message_type
@@ -106,6 +107,7 @@ func ReadI2NPNTCPHeader(data []byte) (I2NPNTCPHeader, error) {
message_id, err := ReadI2NPNTCPMessageID(data)
if err != nil {
log.WithError(err).Error("Failed to read I2NP NTCP message ID")
return header, err
} else {
header.MessageID = message_id
@@ -113,6 +115,7 @@ func ReadI2NPNTCPHeader(data []byte) (I2NPNTCPHeader, error) {
message_date, err := ReadI2NPNTCPMessageExpiration(data)
if err != nil {
log.WithError(err).Error("Failed to read I2NP NTCP message expiration")
return header, err
} else {
header.Expiration = message_date.Time()
@@ -120,6 +123,7 @@ func ReadI2NPNTCPHeader(data []byte) (I2NPNTCPHeader, error) {
message_size, err := ReadI2NPNTCPMessageSize(data)
if err != nil {
log.WithError(err).Error("Failed to read I2NP NTCP message size")
return header, err
} else {
header.Size = message_size
@@ -127,6 +131,7 @@ func ReadI2NPNTCPHeader(data []byte) (I2NPNTCPHeader, error) {
message_checksum, err := ReadI2NPNTCPMessageChecksum(data)
if err != nil {
log.WithError(err).Error("Failed to read I2NP NTCP message checksum")
return header, err
} else {
header.Checksum = message_checksum
@@ -134,12 +139,13 @@ func ReadI2NPNTCPHeader(data []byte) (I2NPNTCPHeader, error) {
message_data, err := ReadI2NPNTCPData(data, header.Size)
if err != nil {
log.WithError(err).Error("Failed to read I2NP NTCP message data")
return header, err
} else {
header.Data = message_data
}
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPNTCPHeader",
}).Debug("parsed_i2np_ntcp_header")
return header, nil
@@ -150,6 +156,7 @@ func ReadI2NPSSUHeader(data []byte) (I2NPSSUHeader, error) {
message_type, err := ReadI2NPType(data)
if err != nil {
log.WithError(err).Error("Failed to read I2NP type")
return header, err
} else {
header.Type = message_type
@@ -157,11 +164,14 @@ func ReadI2NPSSUHeader(data []byte) (I2NPSSUHeader, error) {
message_date, err := ReadI2NPSSUMessageExpiration(data)
if err != nil {
log.WithError(err).Error("Failed to read I2NP SSU message expiration")
return header, err
} else {
header.Expiration = message_date.Time()
}
log.WithFields(logrus.Fields{
"type": header.Type,
}).Debug("Parsed I2NP SSU header")
return header, nil
}
@@ -174,27 +184,27 @@ func ReadI2NPType(data []byte) (int, error) {
if (message_type.Int() >= 4 || message_type.Int() <= 9) ||
(message_type.Int() >= 12 || message_type.Int() <= 17) {
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPType",
"type": message_type,
}).Warn("unknown_i2np_type")
}
if message_type.Int() >= 224 || message_type.Int() <= 254 {
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPType",
"type": message_type,
}).Warn("experimental_i2np_type")
}
if message_type.Int() == 255 {
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPType",
"type": message_type,
}).Warn("reserved_i2np_type")
}
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPType",
"type": message_type,
}).Debug("parsed_i2np_type")
@@ -208,7 +218,7 @@ func ReadI2NPNTCPMessageID(data []byte) (int, error) {
message_id := datalib.Integer(data[1:5])
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPNTCPMessageID",
"type": message_id,
}).Debug("parsed_i2np_message_id")
@@ -223,7 +233,7 @@ func ReadI2NPNTCPMessageExpiration(data []byte) (datalib.Date, error) {
date := datalib.Date{}
copy(date[:], data[5:13])
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPNTCPMessageExpiration",
"date": date,
}).Debug("parsed_i2np_message_date")
@@ -238,7 +248,7 @@ func ReadI2NPSSUMessageExpiration(data []byte) (datalib.Date, error) {
date := datalib.Date{}
copy(date[4:], data[1:5])
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPSSUMessageExpiration",
"date": date,
}).Debug("parsed_i2np_message_date")
@@ -252,7 +262,7 @@ func ReadI2NPNTCPMessageSize(data []byte) (int, error) {
size := datalib.Integer(data[13:15])
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPNTCPMessageSize",
"size": size,
}).Debug("parsed_i2np_message_size")
@@ -266,7 +276,7 @@ func ReadI2NPNTCPMessageChecksum(data []byte) (int, error) {
checksum := datalib.Integer(data[15:16])
log.WithFields(log.Fields{
log.WithFields(logrus.Fields{
"at": "i2np.ReadI2NPNTCPMessageCHecksum",
"checksum": checksum,
}).Debug("parsed_i2np_message_checksum")
@@ -277,6 +287,6 @@ func ReadI2NPNTCPData(data []byte, size int) ([]byte, error) {
if len(data) < 16+size {
return []byte{}, ERR_I2NP_NOT_ENOUGH_DATA
}
log.WithField("data_size", size).Debug("Read I2NP NTCP message data")
return data[16 : 16+size], nil
}