mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

4109. [port] linux: support reading the local port range from

Browse Source 
net.ipv4.ip_local_port_range. [RT # 39379]
This commit is contained in:
Mark Andrews
2015-04-25 08:25:42 +10:00
parent 8168c28739
commit e77e449549
3 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
4109. [port] linux: support reading the local port range from
net.ipv4.ip_local_port_range. [RT # 39379]
4108. [func] An additional NXDOMAIN redirect method (option 4108. [func] An additional NXDOMAIN redirect method (option
"nxdomain-redirect") has been added, allowing "nxdomain-redirect") has been added, allowing
redirection to a specified DNS namespace instead redirection to a specified DNS namespace instead

6
doc/arm/notes.xml
View File

@@ -488,6 +488,12 @@
to be configured on the server is now available. to be configured on the server is now available.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Retrieving the local port range from net.ipv4.ip_local_port_range
on Linux is now supported.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</sect2> </sect2>
<sect2 id="relnotes_bugs"> <sect2 id="relnotes_bugs">

31
lib/isc/unix/net.c
View File

@@ -778,12 +778,12 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
sysctlname_lowport = SYSCTL_V6PORTRANGE_LOW; sysctlname_lowport = SYSCTL_V6PORTRANGE_LOW;
sysctlname_hiport = SYSCTL_V6PORTRANGE_HIGH; sysctlname_hiport = SYSCTL_V6PORTRANGE_HIGH;
} }
portlen = sizeof(portlen); portlen = sizeof(port_low);
if (sysctlbyname(sysctlname_lowport, &port_low, &portlen, if (sysctlbyname(sysctlname_lowport, &port_low, &portlen,
NULL, 0) < 0) { NULL, 0) < 0) {
return (ISC_R_FAILURE); return (ISC_R_FAILURE);
} }
portlen = sizeof(portlen); portlen = sizeof(port_high);
if (sysctlbyname(sysctlname_hiport, &port_high, &portlen, if (sysctlbyname(sysctlname_hiport, &port_high, &portlen,
NULL, 0) < 0) { NULL, 0) < 0) {
return (ISC_R_FAILURE); return (ISC_R_FAILURE);
@@ -817,12 +817,12 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
miblen = sizeof(mib_lo6) / sizeof(mib_lo6[0]); miblen = sizeof(mib_lo6) / sizeof(mib_lo6[0]);
} }
portlen = sizeof(portlen); portlen = sizeof(port_low);
if (sysctl(mib_lo, miblen, &port_low, &portlen, NULL, 0) < 0) { if (sysctl(mib_lo, miblen, &port_low, &portlen, NULL, 0) < 0) {
return (ISC_R_FAILURE); return (ISC_R_FAILURE);
} }
portlen = sizeof(portlen); portlen = sizeof(port_high);
if (sysctl(mib_hi, miblen, &port_high, &portlen, NULL, 0) < 0) { if (sysctl(mib_hi, miblen, &port_high, &portlen, NULL, 0) < 0) {
return (ISC_R_FAILURE); return (ISC_R_FAILURE);
} }
@@ -841,11 +841,34 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
isc_result_t isc_result_t
isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) { isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) {
int result = ISC_R_FAILURE; int result = ISC_R_FAILURE;
#if !defined(USE_SYSCTL_PORTRANGE) && defined(__linux)
FILE *fp;
#endif
REQUIRE(low != NULL && high != NULL); REQUIRE(low != NULL && high != NULL);
#if defined(USE_SYSCTL_PORTRANGE) #if defined(USE_SYSCTL_PORTRANGE)
result = getudpportrange_sysctl(af, low, high); result = getudpportrange_sysctl(af, low, high);
#elif defined(__linux)
UNUSED(af);
/*
* Linux local ports are address family agnostic.
*/
fp = fopen("/proc/sys/net/ipv4/ip_local_port_range", "r");
if (fp != NULL) {
int n;
unsigned int l, h;
n = fscanf(fp, "%u %u", &l, &h);
if (n == 2 && (l & ~0xffff) == 0 && (h & ~0xffff) == 0) {
*low = l;
*high = h;
result = ISC_R_SUCCESS;
}
fclose(fp);
}
#else #else
UNUSED(af); UNUSED(af);
#endif #endif