marge: 合并代码

restagent/config/config.go

@@ -100,12 +100,13 @@ type YamlConfig struct {
 	} `yaml:"alarm"`
 
 	MML struct {
-		Port     int    `yaml:"port"`
-		Sleep    int64  `yaml:"sleep"`
-		User     string `yaml:"user"`
-		Password string `ymal:"password"`
-		MmlHome  string `yaml:"mmlHome"`
-		Upload   string `yaml:"upload"`
+		Port            int    `yaml:"port"`
+		Sleep           int64  `yaml:"sleep"`
+		User            string `yaml:"user"`
+		Password        string `ymal:"password"`
+		MmlHome         string `yaml:"mmlHome"`
+		Upload          string `yaml:"upload"`
+		UpfHeaderLength int    `yaml:"upfHeaderLength"`
 	} `yaml:"mml"`
 
 	NE struct {