16 |
$OUT .= ", fwv4-skip='$fwskip' " if ( $fwskip ne '' ); |
$OUT .= ", fwv4-skip='$fwskip' " if ( $fwskip ne '' ); |
17 |
diff -urN smeserver-ddclient-1.3.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm |
diff -urN smeserver-ddclient-1.3.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm |
18 |
--- smeserver-ddclient-1.3.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-11-10 16:11:05.915271983 +0000 |
--- smeserver-ddclient-1.3.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-11-10 16:11:05.915271983 +0000 |
19 |
+++ smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-12-04 14:53:00.000000000 +0000 |
+++ smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-12-13 16:00:00.000000000 +0000 |
20 |
@@ -114,90 +114,164 @@ |
@@ -114,90 +114,164 @@ |
21 |
|
|
22 |
my %ddc_datas = (); |
my %ddc_datas = (); |
26 |
+ # Router/Firewall devices from which it can get ip address |
+ # Router/Firewall devices from which it can get ip address |
27 |
+ # |
+ # |
28 |
+ my $devices = ( [ |
+ my $devices = ( [ |
29 |
+ [ '2wire' => '2Wire 1701HG Gateway' ], |
+ [ '2Wire 1701HG Gateway' => '2wire' ], |
30 |
+ [ '3com-3c886a' => '3com 3c886a 56k Lan Modem' ], |
+ [ '3com 3c886a 56k Lan Modem' => '3com-3c886a' ], |
31 |
+ [ '3com-oc-remote812' => '3com OfficeConnect Remote 812' ], |
+ [ '3com OfficeConnect Remote 812' => '3com-oc-remote812' ], |
32 |
+ [ 'alcatel-510' => 'Alcatel Speed Touch 510' ], |
+ [ 'Alcatel Speed Touch 510' => 'alcatel-510' ], |
33 |
+ [ 'alcatel-530' => 'Alcatel/Thomson SpeedTouch 530' ], |
+ [ 'Alcatel/Thomson SpeedTouch 530' => 'alcatel-530' ], |
34 |
+ [ 'alcatel-stp' => 'Alcatel Speed Touch Pro' ], |
+ [ 'Alcatel Speed Touch Pro' => 'alcatel-stp' ], |
35 |
+ [ 'allnet-1298' => 'Allnet 1298' ], |
+ [ 'Allnet 1298' => 'allnet-1298' ], |
36 |
+ [ 'cayman-3220h' => 'Cayman 3220-H DSL' ], |
+ [ 'Cayman 3220-H DSL' => 'cayman-3220h' ], |
37 |
+ [ 'dlink-524' => 'D-Link DI-524' ], |
+ [ 'D-Link DI-524' => 'dlink-524' ], |
38 |
+ [ 'dlink-604' => 'D-Link DI-604' ], |
+ [ 'D-Link DI-604' => 'dlink-604' ], |
39 |
+ [ 'D-Link DI-614+' => 'dlink-614' ], |
+ [ 'dlink-614' => 'D-Link DI-614+' ], |
40 |
+ [ 'E-tech Router' => 'e-tech' ], |
+ [ 'e-tech' => 'E-tech Router' ], |
41 |
+ [ 'ELSA LanCom DSL/10 DSL FW' => 'elsa-lancom-dsl10' ], |
+ [ 'elsa-lancom-dsl10' => 'ELSA LanCom DSL/10 DSL FW' ], |
42 |
+ [ 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' => 'elsa-lancom-dsl10-ch01' ], |
+ [ 'elsa-lancom-dsl10-ch01' => 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' ], |
43 |
+ [ 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' => 'elsa-lancom-dsl10-ch02' ], |
+ [ 'elsa-lancom-dsl10-ch02' => 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' ], |
44 |
+ [ 'Linksys FW' => 'linksys' ], |
+ [ 'linksys' => 'Linksys FW' ], |
45 |
+ [ 'Linksys RV042 Dual Homed Router WAN Port 2' => 'linksys-rv042-wan1' ], |
+ [ 'linksys-rv042-wan1' => 'Linksys RV042 Dual Homed Router WAN Port 2' ], |
46 |
+ [ 'Linksys RV042 Dual Homed Router WAN Port 2' => 'linksys-rv042-wan2' ], |
+ [ 'linksys-rv042-wan2' => 'Linksys RV042 Dual Homed Router WAN Port 2' ], |
47 |
+ [ 'Linksys FW version 2' => 'linksys-ver2' ], |
+ [ 'linksys-ver2' => 'Linksys FW version 2' ], |
48 |
+ [ 'Linksys FW version 3' => 'linksys-ver3' ], |
+ [ 'linksys-ver3' => 'Linksys FW version 3' ], |
49 |
+ [ 'Linksys WCG200 FW' => 'linksys-wcg200' ], |
+ [ 'linksys-wcg200' => 'Linksys WCG200 FW' ], |
50 |
+ [ 'Linksys WRT854G FW' => 'linksys-wrt854g' ], |
+ [ 'linksys-wrt854g' => 'Linksys WRT854G FW' ], |
51 |
+ [ 'MaxGate UGATE-3x00 FW' => 'maxgate-ugate3x00' ], |
+ [ 'maxgate-ugate3x00' => 'MaxGate UGATE-3x00 FW' ], |
52 |
+ [ 'NetComm NB3' => 'netcomm-nb3' ], |
+ [ 'netcomm-nb3' => 'NetComm NB3' ], |
53 |
+ [ 'netgear-dg834g' => 'netgear-dg834g' ], |
+ [ 'netgear-dg834g' => 'netgear-dg834g' ], |
54 |
+ [ 'Netgear RP614 FW' => 'netgear-rp614' ], |
+ [ 'netgear-rp614' => 'Netgear RP614 FW' ], |
55 |
+ [ 'Netgear FW' => 'netgear-rt3xx' ], |
+ [ 'netgear-rt3xx' => 'Netgear FW' ], |
56 |
+ [ 'Netgear WGT624' => 'netgear-wgt624' ], |
+ [ 'netgear-wgt624' => 'Netgear WGT624' ], |
57 |
+ [ 'Netgear WPN824 FW' => 'netgear-wpn824' ], |
+ [ 'netgear-wpn824' => 'Netgear WPN824 FW' ], |
58 |
+ [ 'Netopia R910 FW' => 'netopia-r910' ], |
+ [ 'netopia-r910' => 'Netopia R910 FW' ], |
59 |
+ [ 'olitec-SX200' => 'olitec-SX200' ], |
+ [ 'olitec-SX200' => 'olitec-SX200' ], |
60 |
+ [ 'Linksys RTP300' => 'rtp300' ], |
+ [ 'rtp300' => 'Linksys RTP300' ], |
61 |
+ [ 'Siemens SpeedStream 4200' => 'siemens-ss4200' ], |
+ [ 'siemens-ss4200' => 'Siemens SpeedStream 4200' ], |
62 |
+ [ 'Sitecom DC-202 FW' => 'sitecom-dc202' ], |
+ [ 'sitecom-dc202' => 'Sitecom DC-202 FW' ], |
63 |
+ [ 'SMC Barricade FW' => 'smc-barricade' ], |
+ [ 'smc-barricade' => 'SMC Barricade FW' ], |
64 |
+ [ 'SMC Barricade FW (7004VBR model config)' => 'smc-barricade-7004vbr' ], |
+ [ 'smc-barricade-7004vbr' => 'SMC Barricade FW (7004VBR model config)' ], |
65 |
+ [ 'SMC Barricade 7401BRA FW' => 'smc-barricade-7401bra' ], |
+ [ 'smc-barricade-7401bra' => 'SMC Barricade 7401BRA FW' ], |
66 |
+ [ 'SMC Barricade FW (alternate config)' => 'smc-barricade-alt' ], |
+ [ 'smc-barricade-alt' => 'SMC Barricade FW (alternate config)' ], |
67 |
+ [ 'SOHOWare BroadGuard NBG800' => 'sohoware-nbg800' ], |
+ [ 'sohoware-nbg800' => 'SOHOWare BroadGuard NBG800' ], |
68 |
+ [ 'Sveasoft WRT54G/WRT54GS' => 'sveasoft' ], |
+ [ 'sveasoft' => 'Sveasoft WRT54G/WRT54GS' ], |
69 |
+ [ 'Thomson SpeedTouch 536v6' => 'thomson-st536v6' ], |
+ [ 'thomson-st536v6' => 'Thomson SpeedTouch 536v6' ], |
70 |
+ [ 'Thomson/Technicolor TG782' => 'thomson-tg782' ], |
+ [ 'thomson-tg782' => 'Thomson/Technicolor TG782' ], |
71 |
+ [ 'Vigor 2200 USB' => 'vigor-2200usb' ], |
+ [ 'vigor-2200usb' => 'Vigor 2200 USB' ], |
72 |
+ [ 'Watchguard Edge X FW' => 'watchguard-edge-x' ], |
+ [ 'watchguard-edge-x' => 'Watchguard Edge X FW' ], |
73 |
+ [ 'Watchguard SOHO FW' => 'watchguard-soho' ], |
+ [ 'watchguard-soho' => 'Watchguard SOHO FW' ], |
74 |
+ [ 'Westell C90-610015-06 DSL Router' => 'westell-6100' ], |
+ [ 'westell-6100' => 'Westell C90-610015-06 DSL Router' ], |
75 |
+ [ 'Xsense Aero' => 'xsense-aero' ] |
+ [ 'xsense-aero' => 'Xsense Aero' ] |
76 |
+ ] ); |
+ ] ); |
77 |
+ return $devices; |
+ return $devices; |
78 |
+ |
+ |
443 |
} |
} |
444 |
else { $ddc_datas{"error"} = $retmsg; } |
else { $ddc_datas{"error"} = $retmsg; } |
445 |
do_display( $c, %ddc_datas ); |
do_display( $c, %ddc_datas ); |
446 |
|
@@ -450,7 +541,7 @@ |
447 |
|
|
448 |
|
foreach $domain ( sort @virtualDomains ) { |
449 |
|
my %properties = $domaindb->get($domain)->props; |
450 |
|
- my $test = $domaindb->get_prop( $domain, "dns" ) || ''; |
451 |
|
+ my $test = $domaindb->get($domain) || ''; |
452 |
|
my %extraprops; |
453 |
|
if ( $test ne '' ) { |
454 |
|
%extraprops = $domaindb->get($domain)->props; |
455 |
@@ -567,6 +658,8 @@ |
@@ -567,6 +658,8 @@ |
456 |
my $Extinterface = $ddretrieve->prop('Extinterface') || ''; |
my $Extinterface = $ddretrieve->prop('Extinterface') || ''; |
457 |
my $cmd = $ddretrieve->prop('cmd') || ''; |
my $cmd = $ddretrieve->prop('cmd') || ''; |