vbatts/go-omaha
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #20 from marineam/trivial

Browse source 
Trivial protocol struct updates
This commit is contained in:
Yifan Gu 2017-05-02 13:38:33 -07:00 committed by GitHub
commit 773016a0fd
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
omaha/package.go
View file

@ -29,12 +29,11 @@ var (
PackageSizeMismatchError = errors.New("package size is invalid") PackageSizeMismatchError = errors.New("package size is invalid")
) )
// Package represents a single downloadable file. The Sha256 attribute // Package represents a single downloadable file.
// is not a standard part of the Omaha protocol which only uses Sha1.
type Package struct { type Package struct {
Name string `xml:"name,attr"` Name string `xml:"name,attr"`
Sha1 string `xml:"hash,attr"` Sha1 string `xml:"hash,attr"`
Sha256 string `xml:"sha256,attr,omitempty"` Sha256 string `xml:"hash_sha256,attr,omitempty"`
Size uint64 `xml:"size,attr"` Size uint64 `xml:"size,attr"`
Required bool `xml:"required,attr"` Required bool `xml:"required,attr"`
} }

20
omaha/protocol.go
View file

@ -32,13 +32,13 @@ type Request struct {
OS *OS `xml:"os"` OS *OS `xml:"os"`
Apps []*AppRequest `xml:"app"` Apps []*AppRequest `xml:"app"`
Protocol string `xml:"protocol,attr"` Protocol string `xml:"protocol,attr"`
Version string `xml:"version,attr,omitempty"` InstallSource string `xml:"installsource,attr,omitempty"`
IsMachine string `xml:"ismachine,attr,omitempty"` IsMachine string `xml:"ismachine,attr,omitempty"`
RequestId string `xml:"requestid,attr,omitempty"` RequestId string `xml:"requestid,attr,omitempty"`
SessionId string `xml:"sessionid,attr,omitempty"` SessionId string `xml:"sessionid,attr,omitempty"`
UserId string `xml:"userid,attr,omitempty"`
InstallSource string `xml:"installsource,attr,omitempty"`
TestSource string `xml:"testsource,attr,omitempty"` TestSource string `xml:"testsource,attr,omitempty"`
UserId string `xml:"userid,attr,omitempty"`
Version string `xml:"version,attr,omitempty"`
// update engine extension, duplicates the version attribute. // update engine extension, duplicates the version attribute.
UpdaterVersion string `xml:"updaterversion,attr,omitempty"` UpdaterVersion string `xml:"updaterversion,attr,omitempty"`
@ -67,24 +67,24 @@ type AppRequest struct {
UpdateCheck *UpdateRequest `xml:"updatecheck"` UpdateCheck *UpdateRequest `xml:"updatecheck"`
Events []*EventRequest `xml:"event" json:",omitempty"` Events []*EventRequest `xml:"event" json:",omitempty"`
Id string `xml:"appid,attr,omitempty"` Id string `xml:"appid,attr,omitempty"`
Version string `xml:"version,attr,omitempty"`
NextVersion string `xml:"nextversion,attr,omitempty"`
Lang string `xml:"lang,attr,omitempty"`
Client string `xml:"client,attr,omitempty"` Client string `xml:"client,attr,omitempty"`
InstallAge string `xml:"installage,attr,omitempty"` InstallAge string `xml:"installage,attr,omitempty"`
Lang string `xml:"lang,attr,omitempty"`
NextVersion string `xml:"nextversion,attr,omitempty"`
Version string `xml:"version,attr,omitempty"`
// update engine extensions // update engine extensions
Track string `xml:"track,attr,omitempty"`
FromTrack string `xml:"from_track,attr,omitempty"`
Board string `xml:"board,attr,omitempty"` Board string `xml:"board,attr,omitempty"`
DeltaOK bool `xml:"delta_okay,attr,omitempty"` DeltaOK bool `xml:"delta_okay,attr,omitempty"`
FromTrack string `xml:"from_track,attr,omitempty"`
Track string `xml:"track,attr,omitempty"`
// coreos update engine extensions // coreos update engine extensions
AlephVersion string `xml:"alephversion,attr,omitempty"`
BootId string `xml:"bootid,attr,omitempty"` BootId string `xml:"bootid,attr,omitempty"`
MachineID string `xml:"machineid,attr,omitempty"` MachineID string `xml:"machineid,attr,omitempty"`
OEM string `xml:"oem,attr,omitempty"` OEM string `xml:"oem,attr,omitempty"`
OEMVersion string `xml:"oemversion,attr,omitempty"` OEMVersion string `xml:"oemversion,attr,omitempty"`
AlephVersion string `xml:"alephversion,attr,omitempty"`
} }
func (a *AppRequest) AddUpdateCheck() *UpdateRequest { func (a *AppRequest) AddUpdateCheck() *UpdateRequest {
@ -116,9 +116,9 @@ type PingRequest struct {
type EventRequest struct { type EventRequest struct {
Type EventType `xml:"eventtype,attr"` Type EventType `xml:"eventtype,attr"`
Result EventResult `xml:"eventresult,attr"` Result EventResult `xml:"eventresult,attr"`
ErrorCode string `xml:"errorcode,attr,omitempty"`
NextVersion string `xml:"nextversion,attr,omitempty"` NextVersion string `xml:"nextversion,attr,omitempty"`
PreviousVersion string `xml:"previousversion,attr,omitempty"` PreviousVersion string `xml:"previousversion,attr,omitempty"`
ErrorCode string `xml:"errorcode,attr,omitempty"`
} }
// Response sent by the Omaha server // Response sent by the Omaha server