|
@@ -87,16 +87,12 @@ func (s *udpForWardingService) GetUdpForWarding(ctx context.Context,req v1.GetFo
|
|
if err = g.Wait(); err != nil {
|
|
if err = g.Wait(); err != nil {
|
|
return v1.UdpForwardingDataRequest{}, err
|
|
return v1.UdpForwardingDataRequest{}, err
|
|
}
|
|
}
|
|
- portInt, err := strconv.Atoi(udpForWarding.Port)
|
|
|
|
- if err != nil {
|
|
|
|
- return v1.UdpForwardingDataRequest{}, err
|
|
|
|
- }
|
|
|
|
|
|
|
|
return v1.UdpForwardingDataRequest{
|
|
return v1.UdpForwardingDataRequest{
|
|
Id: udpForWarding.Id,
|
|
Id: udpForWarding.Id,
|
|
WafUdpId: udpForWarding.WafUdpId,
|
|
WafUdpId: udpForWarding.WafUdpId,
|
|
Tag: udpForWarding.Tag,
|
|
Tag: udpForWarding.Tag,
|
|
- Port: portInt,
|
|
|
|
|
|
+ Port: udpForWarding.Port,
|
|
WafGatewayGroupId: udpForWarding.WafGatewayGroupId,
|
|
WafGatewayGroupId: udpForWarding.WafGatewayGroupId,
|
|
WafUdpLimitId: udpForWarding.UdpLimitRuleId,
|
|
WafUdpLimitId: udpForWarding.UdpLimitRuleId,
|
|
CcPacketCount: udpForWarding.CcPacketCount,
|
|
CcPacketCount: udpForWarding.CcPacketCount,
|
|
@@ -142,7 +138,7 @@ func (s *udpForWardingService) buildUdpForwardingModel(req *v1.UdpForwardingData
|
|
HostId: require.HostId,
|
|
HostId: require.HostId,
|
|
WafUdpId: ruleId,
|
|
WafUdpId: ruleId,
|
|
Tag: require.Tag,
|
|
Tag: require.Tag,
|
|
- Port: strconv.Itoa(req.Port),
|
|
|
|
|
|
+ Port: req.Port,
|
|
WafGatewayGroupId: require.WafGatewayGroupId,
|
|
WafGatewayGroupId: require.WafGatewayGroupId,
|
|
UdpLimitRuleId: require.LimitRuleId,
|
|
UdpLimitRuleId: require.LimitRuleId,
|
|
CcPacketCount: req.CcPacketCount,
|
|
CcPacketCount: req.CcPacketCount,
|
|
@@ -190,13 +186,18 @@ func (s *udpForWardingService) prepareWafData(ctx context.Context, req *v1.UdpFo
|
|
allowIpListStr := strings.Join(req.UdpForwardingData.AllowIpList, "\n")
|
|
allowIpListStr := strings.Join(req.UdpForwardingData.AllowIpList, "\n")
|
|
denyIpListStr := strings.Join(req.UdpForwardingData.DenyIpList, "\n")
|
|
denyIpListStr := strings.Join(req.UdpForwardingData.DenyIpList, "\n")
|
|
|
|
|
|
|
|
+ PortInt, err := strconv.Atoi(req.UdpForwardingData.Port)
|
|
|
|
+ if err != nil {
|
|
|
|
+ return v1.GlobalRequire{}, nil, err
|
|
|
|
+ }
|
|
|
|
+
|
|
// 3. 创建用于构建 WAF 表单的数据结构
|
|
// 3. 创建用于构建 WAF 表单的数据结构
|
|
formDataBase := v1.UdpForwardingDataSend{
|
|
formDataBase := v1.UdpForwardingDataSend{
|
|
Tag: require.Tag,
|
|
Tag: require.Tag,
|
|
WafUdpId: req.UdpForwardingData.WafUdpId,
|
|
WafUdpId: req.UdpForwardingData.WafUdpId,
|
|
WafGatewayGroupId: require.WafGatewayGroupId,
|
|
WafGatewayGroupId: require.WafGatewayGroupId,
|
|
WafUdpLimitId: require.LimitRuleId,
|
|
WafUdpLimitId: require.LimitRuleId,
|
|
- Port: req.UdpForwardingData.Port,
|
|
|
|
|
|
+ Port: PortInt,
|
|
CcPacketCount: req.UdpForwardingData.CcPacketCount,
|
|
CcPacketCount: req.UdpForwardingData.CcPacketCount,
|
|
CcPacketDuration: req.UdpForwardingData.CcPacketDuration,
|
|
CcPacketDuration: req.UdpForwardingData.CcPacketDuration,
|
|
CcCount: req.UdpForwardingData.CcCount,
|
|
CcCount: req.UdpForwardingData.CcCount,
|