#33: Support multiple values for OSMatch

Author: vdjagilev

formatter/nmap_host.go

@@ -74,7 +74,7 @@ type HostName struct {
 type OS struct {
 	OSPortUsed []OSPortUsed `xml:"portused"`
 	OSClass    OSClass      `xml:"osclass"`
-	OSMatch    OSMatch      `xml:"osmatch"`
+	OSMatch    []OSMatch    `xml:"osmatch"`
 }
 
 // OSPortUsed defines which ports were used for OS detection

formatter/resources/templates/markdown.tmpl

@@ -65,8 +65,8 @@ NMAP Scan Result: {{ .NMAPRun.StartStr }}
 {{- range .OS.OSPortUsed }}
 | Used port | **{{ .PortID }}/{{ .Protocol }} ({{ .State }})** |
 {{- end -}}{{/* range .OS.OSPortUsed */}}
-{{- if .OS.OSMatch.Name }}
-| OS | **{{ .OS.OSMatch.Name }} ({{ .OS.OSMatch.Accuracy }}%)** |
+{{- range .OS.OSMatch }}
+| OS | **{{ .Name }} ({{ .Accuracy }}%)** |
 {{- else }}{{/* if .OS.OSMatch.Name */}}
 | OS | N/A |
 {{- end -}}{{/* if .OS.OSMatch.Name */}}

formatter/resources/templates/simple-html.gohtml

@@ -204,8 +204,8 @@
 						{{ range .OS.OSPortUsed }}
 						<li>Used port: <strong>{{ .PortID }}/{{ .Protocol }} ({{ .State }})</strong></li>
 						{{ end }}
-						{{ if .OS.OSMatch.Name }}
-						<li>OS: <strong>{{ .OS.OSMatch.Name }} ({{ .OS.OSMatch.Accuracy }}%)</strong></li>
+						{{ range .OS.OSMatch }}
+						<li>OS: <strong>{{ .Name }} ({{ .Accuracy }}%)</strong></li>
 						{{ else }}
 						<li>OS: N/A</li>
 						{{ end }}