Skip to content

Add parsing of RFC 5424-style packets #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrissnell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add parsing of RFC 5424-style packets #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ func (s *Server) passToHandlers(m *Message) {
}

func (s *Server) receiver(c net.PacketConn) {
//q := (chan<- Message)(s.q)
buf := make([]byte, 1024)
for {
n, addr, err := c.ReadFrom(buf)
Expand Down Expand Up @@ -132,23 +131,39 @@ func (s *Server) receiver(c net.PacketConn) {
m.Severity = Severity(prio & 0x07)
m.Facility = Facility(prio >> 3)

hostnameOffset := 0
ts := time.Now()

// Parse header (if exists)
if hasPrio && len(pkt) >= 16 && pkt[15] == ' ' {
// Get timestamp
if hasPrio && len(pkt) >= 26 && pkt[25] == ' ' && pkt[15] != ' ' {
// OK, it looks like we're dealing with a RFC 5424-style packet
ts, err := time.Parse(time.RFC3339, string(pkt[:25]))
if err == nil && !ts.IsZero() {
// Time parsed correctly. This is most certainly a RFC 5424-style packet.
// Hostname starts at pkt[26]
hostnameOffset = 26
}
} else if hasPrio && len(pkt) >= 16 && pkt[15] == ' ' {
// Looks like we're dealing with a RFC 3164-style packet
layout := "Jan _2 15:04:05"
ts, err := time.Parse(layout, string(pkt[:15]))
if err == nil && !ts.IsZero() {
// Get hostname
n = 16 + bytes.IndexByte(pkt[16:], ' ')
if n != 15 {
m.Timestamp = ts
m.Hostname = string(pkt[16:n])
pkt = pkt[n+1:]
}
// Time parsed correctly. This is most certainly a RFC 3164-style packet.
hostnameOffset = 16
}
}

if hostnameOffset == 0 {
log.Printf("Packet did not parse correctly:\n%v\n", string(pkt[:]))
} else {
n = hostnameOffset + bytes.IndexByte(pkt[hostnameOffset:], ' ')
if n != hostnameOffset-1 {
m.Timestamp = ts
m.Hostname = string(pkt[hostnameOffset:n])
pkt = pkt[n+1:]
}
// TODO: check for version an new format of header as
// described in RFC 5424.
}
_ = hostnameOffset

// Parse msg part
msg := string(bytes.TrimRightFunc(pkt, isNulCrLf))
Expand Down