diff --git a/component/dialer/dialer.go b/component/dialer/dialer.go index 2a39508f3f..41f79b8e52 100644 --- a/component/dialer/dialer.go +++ b/component/dialer/dialer.go @@ -84,7 +84,7 @@ func ListenPacket(ctx context.Context, network, address string, rAddrPort netip. if cfg.addrReuse { addrReuseToListenConfig(lc) } - if DefaultSocketHook != nil { // ignore interfaceName, routingMark when DefaultSocketHook not null (in CFMA) + if DefaultSocketHook != nil { // ignore interfaceName, routingMark when DefaultSocketHook not null (in CMFA) socketHookToListenConfig(lc) } else { if cfg.interfaceName != "" { @@ -148,7 +148,7 @@ func dialContext(ctx context.Context, network string, destination netip.Addr, po setMultiPathTCP(dialer) } - if DefaultSocketHook != nil { // ignore interfaceName, routingMark and tfo when DefaultSocketHook not null (in CFMA) + if DefaultSocketHook != nil { // ignore interfaceName, routingMark and tfo when DefaultSocketHook not null (in CMFA) socketHookToToDialer(dialer) } else { if opt.interfaceName != "" { diff --git a/component/dialer/socket_hook.go b/component/dialer/socket_hook.go index 7a2ea43215..f860552579 100644 --- a/component/dialer/socket_hook.go +++ b/component/dialer/socket_hook.go @@ -7,11 +7,11 @@ import ( ) // SocketControl -// never change type traits because it's used in CFMA +// never change type traits because it's used in CMFA type SocketControl func(network, address string, conn syscall.RawConn) error // DefaultSocketHook -// never change type traits because it's used in CFMA +// never change type traits because it's used in CMFA var DefaultSocketHook SocketControl func socketHookToToDialer(dialer *net.Dialer) { diff --git a/component/process/process.go b/component/process/process.go index 84020c4d38..464f5a79bc 100644 --- a/component/process/process.go +++ b/component/process/process.go @@ -23,11 +23,11 @@ func FindProcessName(network string, srcIP netip.Addr, srcPort int) (uint32, str } // PackageNameResolver -// never change type traits because it's used in CFMA +// never change type traits because it's used in CMFA type PackageNameResolver func(metadata *C.Metadata) (string, error) // DefaultPackageNameResolver -// never change type traits because it's used in CFMA +// never change type traits because it's used in CMFA var DefaultPackageNameResolver PackageNameResolver func FindPackageName(metadata *C.Metadata) (string, error) { diff --git a/docs/config.yaml b/docs/config.yaml index 1da37841cb..78e62d1280 100644 --- a/docs/config.yaml +++ b/docs/config.yaml @@ -955,12 +955,12 @@ rule-providers: # 对于behavior=domain: # - format=yaml 可以通过“mihomo convert-ruleset domain yaml XXX.yaml XXX.mrs”转换到mrs格式 # - format=text 可以通过“mihomo convert-ruleset domain text XXX.text XXX.mrs”转换到mrs格式 - # - XXX.mrs 可以通过"mihomo convert-ruleset domain mrs XXX.mrs XXX.text"转换回text格式(暂不支持转换回ymal格式) + # - XXX.mrs 可以通过"mihomo convert-ruleset domain mrs XXX.mrs XXX.text"转换回text格式(暂不支持转换回yaml格式) # # 对于behavior=ipcidr: # - format=yaml 可以通过“mihomo convert-ruleset ipcidr yaml XXX.yaml XXX.mrs”转换到mrs格式 # - format=text 可以通过“mihomo convert-ruleset ipcidr text XXX.text XXX.mrs”转换到mrs格式 - # - XXX.mrs 可以通过"mihomo convert-ruleset ipcidr mrs XXX.mrs XXX.text"转换回text格式(暂不支持转换回ymal格式) + # - XXX.mrs 可以通过"mihomo convert-ruleset ipcidr mrs XXX.mrs XXX.text"转换回text格式(暂不支持转换回yaml格式) # type: http url: "url" diff --git a/listener/http/server.go b/listener/http/server.go index 74e117f265..48f12dc5f1 100644 --- a/listener/http/server.go +++ b/listener/http/server.go @@ -37,7 +37,7 @@ func New(addr string, tunnel C.Tunnel, additions ...inbound.Addition) (*Listener } // NewWithAuthenticate -// never change type traits because it's used in CFMA +// never change type traits because it's used in CMFA func NewWithAuthenticate(addr string, tunnel C.Tunnel, authenticate bool, additions ...inbound.Addition) (*Listener, error) { getAuth := authStore.Authenticator if !authenticate {