Skip to content

Commit a320457

Browse files
committed
internal/protocol: use encoding/xml fork for name space prefixes
1 parent e4dcee0 commit a320457

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

internal/protocol/xml.go

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
package protocol
22

33
import (
4-
"encoding/xml"
5-
6-
"github.com/domainr/epp/ns"
4+
"github.com/domainr/epp/internal/encoding/xml"
75
)
86

97
type EPP struct {
8+
XMLName struct{} `xml:"urn:ietf:params:xml:ns:epp-1.0 epp"`
109
Command *Command `xml:"command,omitempty"`
1110
}
1211

13-
func (epp *EPP) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
14-
// start.Attr = append(start.Attr, xml.Attr{Name: xml.Name{Local: "xmlns"}, Value: ns.EPP})
15-
start.Name.Space = ns.EPP
16-
start.Name.Local = "epp"
17-
type proxy EPP
18-
return e.EncodeElement((*proxy)(epp), start)
19-
}
12+
// func (epp *EPP) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
13+
// // start.Attr = append(start.Attr, xml.Attr{Name: xml.Name{Local: "xmlns"}, Value: ns.EPP})
14+
// start.Name.Space = ns.EPP
15+
// start.Name.Local = "epp"
16+
// type proxy EPP
17+
// return e.EncodeElement((*proxy)(epp), start)
18+
// }
2019

2120
type Command struct {
2221
Check *Check `xml:"check,omitempty"`
@@ -31,12 +30,9 @@ type DomainCheck struct {
3130
}
3231

3332
func (dc *DomainCheck) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
34-
// start.Attr = append(start.Attr, xml.Attr{Name: xml.Name{Local: "xmlns:domain"}, Value: start.Name.Space})
35-
// start.Name.Local = "domain:" + start.Name.Local
36-
// start.Name.Space = ""
33+
start.Attr = append(start.Attr, xml.Attr{Name: xml.Name{Space: "xmlns", Local: "domain"}, Value: start.Name.Space})
3734
type proxy DomainCheck
38-
return encodePrefixed(e, (*proxy)(dc), start, "domain")
39-
// return e.EncodeElement((*proxy)(dc), start)
35+
return e.EncodeElement((*proxy)(dc), start)
4036
}
4137

4238
type DomainNames []string

0 commit comments

Comments
 (0)