"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "pkg/config/proxy.go" between
frp-0.36.1.tar.gz and frp-0.36.2.tar.gz

About: frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall to the Internet. As of now, it supports TCP and UDP, as well as HTTP and HTTPS protocols, and it also has a P2P connect mode.

proxy.go  (frp-0.36.1):proxy.go  (frp-0.36.2)
skipping to change at line 147 skipping to change at line 147
ProxyProtocolVersion string `ini:"proxy_protocol_version" json:"proxy_pro tocol_version"` ProxyProtocolVersion string `ini:"proxy_protocol_version" json:"proxy_pro tocol_version"`
// BandwidthLimit limit the bandwidth // BandwidthLimit limit the bandwidth
// 0 means no limit // 0 means no limit
BandwidthLimit BandwidthQuantity `ini:"bandwidth_limit" json:"bandwidth_l imit"` BandwidthLimit BandwidthQuantity `ini:"bandwidth_limit" json:"bandwidth_l imit"`
// meta info for each proxy // meta info for each proxy
Metas map[string]string `ini:"-" json:"metas"` Metas map[string]string `ini:"-" json:"metas"`
// TODO: LocalSvrConf => LocalAppConf // TODO: LocalSvrConf => LocalAppConf
LocalSvrConf `ini:",extends" json:"inline"` LocalSvrConf `ini:",extends"`
HealthCheckConf `ini:",extends" json:"inline"` HealthCheckConf `ini:",extends"`
} }
type DomainConf struct { type DomainConf struct {
CustomDomains []string `ini:"custom_domains" json:"custom_domains"` CustomDomains []string `ini:"custom_domains" json:"custom_domains"`
SubDomain string `ini:"subdomain" json:"subdomain"` SubDomain string `ini:"subdomain" json:"subdomain"`
} }
// HTTP // HTTP
type HTTPProxyConf struct { type HTTPProxyConf struct {
BaseProxyConf `ini:",extends" json:"inline"` BaseProxyConf `ini:",extends"`
DomainConf `ini:",extends" json:"inline"` DomainConf `ini:",extends"`
Locations []string `ini:"locations" json:"locations"` Locations []string `ini:"locations" json:"locations"`
HTTPUser string `ini:"http_user" json:"http_user"` HTTPUser string `ini:"http_user" json:"http_user"`
HTTPPwd string `ini:"http_pwd" json:"http_pwd"` HTTPPwd string `ini:"http_pwd" json:"http_pwd"`
HostHeaderRewrite string `ini:"host_header_rewrite" json:"host _header_rewrite"` HostHeaderRewrite string `ini:"host_header_rewrite" json:"host _header_rewrite"`
Headers map[string]string `ini:"-" json:"headers"` Headers map[string]string `ini:"-" json:"headers"`
} }
// HTTPS // HTTPS
type HTTPSProxyConf struct { type HTTPSProxyConf struct {
BaseProxyConf `ini:",extends" json:"inline"` BaseProxyConf `ini:",extends"`
DomainConf `ini:",extends" json:"inline"` DomainConf `ini:",extends"`
} }
// TCP // TCP
type TCPProxyConf struct { type TCPProxyConf struct {
BaseProxyConf `ini:",extends" json:"inline"` BaseProxyConf `ini:",extends"`
RemotePort int `ini:"remote_port" json:"remote_port"` RemotePort int `ini:"remote_port" json:"remote_port"`
} }
// TCPMux // TCPMux
type TCPMuxProxyConf struct { type TCPMuxProxyConf struct {
BaseProxyConf `ini:",extends" json:"inline"` BaseProxyConf `ini:",extends"`
DomainConf `ini:",extends" json:"inline"` DomainConf `ini:",extends"`
Multiplexer string `ini:"multiplexer"` Multiplexer string `ini:"multiplexer"`
} }
// STCP // STCP
type STCPProxyConf struct { type STCPProxyConf struct {
BaseProxyConf `ini:",extends" json:"inline"` BaseProxyConf `ini:",extends"`
Role string `ini:"role" json:"role"` Role string `ini:"role" json:"role"`
Sk string `ini:"sk" json:"sk"` Sk string `ini:"sk" json:"sk"`
} }
// XTCP // XTCP
type XTCPProxyConf struct { type XTCPProxyConf struct {
BaseProxyConf `ini:",extends" json:"inline"` BaseProxyConf `ini:",extends"`
Role string `ini:"role" json:"role"` Role string `ini:"role" json:"role"`
Sk string `ini:"sk" json:"sk"` Sk string `ini:"sk" json:"sk"`
} }
// UDP // UDP
type UDPProxyConf struct { type UDPProxyConf struct {
BaseProxyConf `ini:",extends" json:"inline"` BaseProxyConf `ini:",extends"`
RemotePort int `ini:"remote_port" json:"remote_port"` RemotePort int `ini:"remote_port" json:"remote_port"`
} }
// SUDP // SUDP
type SUDPProxyConf struct { type SUDPProxyConf struct {
BaseProxyConf `ini:",extends" json:"inline"` BaseProxyConf `ini:",extends"`
Role string `ini:"role" json:"role"` Role string `ini:"role" json:"role"`
Sk string `ini:"sk" json:"sk"` Sk string `ini:"sk" json:"sk"`
} }
// Proxy Conf Loader // Proxy Conf Loader
// DefaultProxyConf creates a empty ProxyConf object by proxyType. // DefaultProxyConf creates a empty ProxyConf object by proxyType.
// If proxyType doesn't exist, return nil. // If proxyType doesn't exist, return nil.
func DefaultProxyConf(proxyType string) ProxyConf { func DefaultProxyConf(proxyType string) ProxyConf {
var conf ProxyConf var conf ProxyConf
 End of changes. 9 change blocks. 
13 lines changed or deleted 13 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)