Commit 23139109 authored by Mikio Hara's avatar Mikio Hara

go.net/ipv4: make IANA registry parser robust

- specify complete resource path to avoid receiving xhtml
- make use of keyword instead of table index

R=dave
CC=golang-dev
https://golang.org/cl/10700045
parent 6226a2f7
...@@ -28,7 +28,7 @@ var registries = []struct { ...@@ -28,7 +28,7 @@ var registries = []struct {
parse func(io.Writer, io.Reader) error parse func(io.Writer, io.Reader) error
}{ }{
{ {
"http://www.iana.org/assignments/icmp-parameters", "http://www.iana.org/assignments/icmp-parameters/icmp-parameters.xml",
parseICMPv4Parameters, parseICMPv4Parameters,
}, },
{ {
...@@ -73,7 +73,7 @@ func parseICMPv4Parameters(w io.Writer, r io.Reader) error { ...@@ -73,7 +73,7 @@ func parseICMPv4Parameters(w io.Writer, r io.Reader) error {
if err := dec.Decode(&icp); err != nil { if err := dec.Decode(&icp); err != nil {
return err return err
} }
prs := icp.escape(0) prs := icp.escape()
fmt.Fprintf(w, "// %s, Updated: %s\n", icp.Title, icp.Updated) fmt.Fprintf(w, "// %s, Updated: %s\n", icp.Title, icp.Updated)
fmt.Fprintf(w, "const (\n") fmt.Fprintf(w, "const (\n")
for _, pr := range prs { for _, pr := range prs {
...@@ -119,7 +119,17 @@ type canonICMPv4ParamRecord struct { ...@@ -119,7 +119,17 @@ type canonICMPv4ParamRecord struct {
Value int Value int
} }
func (icp *icmpv4Parameters) escape(id int) []canonICMPv4ParamRecord { func (icp *icmpv4Parameters) escape() []canonICMPv4ParamRecord {
id := -1
for i, r := range icp.Registries {
if strings.Contains(r.Title, "Type") || strings.Contains(r.Title, "type") {
id = i
break
}
}
if id < 0 {
return nil
}
prs := make([]canonICMPv4ParamRecord, len(icp.Registries[id].Records)) prs := make([]canonICMPv4ParamRecord, len(icp.Registries[id].Records))
sr := strings.NewReplacer( sr := strings.NewReplacer(
"Messages", "", "Messages", "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment