Return more data from Info calls

Author: NamelessOne91

protocols/arp.go

@@ -65,5 +65,19 @@ func (p ARPPacket) Source() string {
 }
 
 func (p ARPPacket) Info() string {
-	return fmt.Sprintf("%s ARP packet from %s to %s", HardwareTypeValues[p.HardwareType], p.Source(), p.Destination())
+	hwType := HardwareTypeValues[p.HardwareType]
+
+	return fmt.Sprintf(`
+ARP Packet
+
+Hardware Type: %s
+Protocol Type: %d
+Sender HW Address: %s
+Target HW Address: %s
+
+===============================
+%s`,
+		hwType, p.ProtocolType, p.SenderHWAddr.String(), p.TargetHWAddr.String(), p.EthFrame.Info(),
+	)
+
 }

protocols/eth.go

@@ -48,5 +48,14 @@ func (f EthernetFrame) Type() string {
 
 // Info returns an human-readable string containing all the ETH frame data
 func (f EthernetFrame) Info() string {
-	return fmt.Sprintf("%s Ethernet Frame from MAC %s to MAC %s", f.Type(), f.SourceMAC, f.DestinationMAC)
+	etv := EtherTypesValues[f.EtherType]
+
+	return fmt.Sprintf(`
+Ethernet Frame
+
+Destination MAC: %s
+Source MAC: %s
+EtherType: 0x%X (%s)`,
+		f.DestinationMAC, f.SourceMAC, f.EtherType, etv,
+	)
 }

protocols/ip.go

@@ -155,8 +155,30 @@ func (p ipv4Packet) Payload() []byte {
 
 // Info returns an human-readable string containing the main IPv4 packet data
 func (p ipv4Packet) Info() string {
-	return fmt.Sprintf("%s IPv4 packet from IP %s to IP %s",
-		p.header.TransportLayerProtocol(), p.header.sourceIP, p.header.destinationIP,
+	return fmt.Sprintf(`
+IPv4 packet
+
+Version: %d
+Header Length: %d bytes
+DSCP: %d
+ECN: %d
+Total Length: %d
+Identification: %d
+Flags: %d
+Fragment Offset: %d
+TTL: %d
+Transport Layer Protocol: %d (%s)
+Header Checksum: %d
+Source IP: %s
+Destination IP: %s
+Options: %v
+
+===============================
+%s`,
+		p.header.version, p.header.ihl*4, p.header.dscp, p.header.ecn, p.header.totalLength, p.header.identification,
+		p.header.flags, p.header.fragmentOffset, p.header.ttl, p.header.protocol, p.header.TransportLayerProtocol(), p.header.headerChecksum,
+		p.header.sourceIP, p.header.destinationIP, p.header.options,
+		p.ethFrame.Info(),
 	)
 }
 
@@ -247,8 +269,24 @@ func (p ipv6Packet) Payload() []byte {
 
 // Info returns an human-readable string containing the main IPv6 packet data
 func (p ipv6Packet) Info() string {
-	return fmt.Sprintf("%s IPv6 packet from IP %s to IP %s",
-		p.header.TransportLayerProtocol(), p.header.sourceIP, p.header.destinationIP,
+	return fmt.Sprintf(`
+IPv6 packet
+
+Version: %d
+Traffic Class: %d
+Flow Label: %d
+Payload Length: %d
+Transport Layer Protocol: %d (%s)
+Hop Limit: %d
+Source IP: %s
+Destination IP: %s
+===============================
+%s
+===============================
+`,
+		p.header.version, p.header.trafficClass, p.header.flowLabel, p.header.payloadLength,
+		p.header.nextHeader, p.header.TransportLayerProtocol(), p.header.hopLimit, p.header.sourceIP, p.header.destinationIP,
+		p.ethFrame.Info(),
 	)
 }
 

protocols/tcp.go

@@ -71,8 +71,16 @@ func TCPHeaderFromBytes(raw []byte) (*TCPHeader, error) {
 
 // Info return an human-readable string containing the main TCP packet data
 func (p TCPPacket) Info() string {
-	return fmt.Sprintf("%s - port %d to port %d",
-		p.IPPacket.Info(), p.Header.SourcePort, p.Header.DestinationPort,
+	return fmt.Sprintf(`
+TCP packet
+
+Source Port: %d
+Destination Port: %d
+Checksum: %d
+
+===============================
+%s`,
+		p.Header.SourcePort, p.Header.SourcePort, p.Header.Checksum, p.IPPacket.Info(),
 	)
 }
 

protocols/udp.go

@@ -36,8 +36,17 @@ func UDPPacketFromIPPacket(ip IPPacket) (*UDPPacket, error) {
 
 // Info return an human-readable string containing the main UDP packet data
 func (p UDPPacket) Info() string {
-	return fmt.Sprintf("%s - port %d to port %d",
-		p.IPPacket.Info(), p.Header.SourcePort, p.Header.DestinationPort,
+	return fmt.Sprintf(`
+UDP packet
+
+Source Port: %d
+Destination Port: %d
+Length: %d
+Checksum: %d
+
+===============================
+%s`,
+		p.Header.SourcePort, p.Header.SourcePort, p.Header.Length, p.Header.Checksum, p.IPPacket.Info(),
 	)
 }
 

tui/models/bisturi_model.go

@@ -103,13 +103,12 @@ func (m bisturiModel) View() string {
 
 	switch m.step {
 	case retrieveIfaces:
-		sb.WriteString(fmt.Sprintf("\n\nWelcome!\n\nRetrieving network interfaces \n\n%s", m.spinner.View()))
+		sb.WriteString(fmt.Sprintf("\nWelcome!\nRetrieving network interfaces \n\n%s", m.spinner.View()))
 	case selectIface, selectProtocol:
 		sb.WriteString(m.startMenu.View())
 	case selectRows:
 		sb.WriteString(m.rowsInput.View())
 	case receivePackets:
-		sb.WriteString(fmt.Sprintf("\n\nReceiving %s packets on %s ...\n\n", m.selectedProtocol, m.selectedInterface.Name))
 		sb.WriteString(m.packetsTable.View())
 	default:
 		sb.WriteString("The program is in an unknown state\nQuit with 'q'")

tui/models/packets_table.go

@@ -1,19 +1,17 @@
 package tui
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/NamelessOne91/bisturi/sockets"
-	"github.com/NamelessOne91/bisturi/tui/styles"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/evertras/bubble-table/table"
 )
 
 const (
 	columnKeyID          = "id"
-	columnKeyDate        = "date"
+	columnKeyTime        = "time"
 	columnKeySource      = "source"
 	columnKeyDestination = "destination"
 	columnKeyInfo        = "info"
@@ -31,7 +29,7 @@ type packetsTableModel struct {
 func (m *packetsTableModel) buildTable() {
 	m.table = table.New([]table.Column{
 		table.NewColumn(columnKeyID, "#", (3*m.width)/100),
-		table.NewColumn(columnKeyDate, "Date", (7*m.width)/100),
+		table.NewColumn(columnKeyTime, "Time", (7*m.width)/100),
 		table.NewColumn(columnKeySource, "Source", (20*m.width)/100),
 		table.NewColumn(columnKeyDestination, "Destination", (20*m.width)/100),
 	}).
@@ -95,9 +93,10 @@ func (m packetsTableModel) View() string {
 	detailsBox := lipgloss.NewStyle().
 		BorderStyle(lipgloss.NormalBorder()).
 		BorderForeground(lipgloss.Color("#00cc99")).
+		Foreground(lipgloss.Color("#00cc99")).
 		Padding(1, 2).
 		Width((40 * m.width) / 100).
-		Height((80 * m.height) / 100).
+		Height((90 * m.height) / 100).
 		Render(detailTxt)
 
 	mainView := lipgloss.JoinHorizontal(
@@ -108,7 +107,6 @@ func (m packetsTableModel) View() string {
 
 	view := lipgloss.JoinVertical(
 		lipgloss.Left,
-		styles.Subtle.Render(fmt.Sprintf("Displaying up to the last %d rows", m.maxRows)),
 		mainView,
 	) + "\n"
 
@@ -135,7 +133,7 @@ func (m *packetsTableModel) addRows(packets []sockets.NetworkPacket) {
 
 		newRow := table.NewRow(table.RowData{
 			columnKeyID:          m.counter,
-			columnKeyDate:        time.Now().Local().Format(time.TimeOnly),
+			columnKeyTime:        time.Now().Local().Format(time.TimeOnly),
 			columnKeySource:      np.Source(),
 			columnKeyDestination: np.Destination(),
 			columnKeyInfo:        np.Info(),