[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd
From: |
Beau Kuiper |
Subject: |
[Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd |
Date: |
Wed, 19 Nov 2003 00:24:42 -0500 |
Module name: muddleftpd
Branch: dev-rugger-nat
Changes by: Beau Kuiper <address@hidden> 03/11/19 00:24:41
Reply-to: address@hidden
CVSROOT: /cvsroot/muddleftpd
Module name: muddleftpd
Branch: dev-rugger-nat
Changes by: Beau Kuiper <address@hidden> 03/11/19 00:24:41
Modified files:
. : ChangeLog NEWS
src : checkip.c
Log message:
Added support for abreviated netmasks.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/ChangeLog.diff?only_with_tag=dev-rugger-nat&tr1=1.9.2.2&tr2=1.9.2.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/NEWS.diff?only_with_tag=dev-rugger-nat&tr1=1.4.2.1&tr2=1.4.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/checkip.c.diff?only_with_tag=dev-rugger-nat&tr1=1.1.8.1&tr2=1.1.8.2&r1=text&r2=text
Patches:
Index: muddleftpd/ChangeLog
diff -c muddleftpd/ChangeLog:1.9.2.2 muddleftpd/ChangeLog:1.9.2.3
*** muddleftpd/ChangeLog:1.9.2.2 Thu Nov 6 08:57:09 2003
--- muddleftpd/ChangeLog Wed Nov 19 00:24:41 2003
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-11-19 Beau Kuiper <address@hidden>
+
+ * checkip.c: Added code to detect and use abbreviated netmasks, eg
+ 192.168.1.0/24.
+
2003-11-06 Beau Kuiper <address@hidden>
* cfloader.c: repaired memory leak on decode of pasvrange directive.
Index: muddleftpd/NEWS
diff -c muddleftpd/NEWS:1.4.2.1 muddleftpd/NEWS:1.4.2.2
*** muddleftpd/NEWS:1.4.2.1 Tue Nov 4 10:41:21 2003
--- muddleftpd/NEWS Wed Nov 19 00:24:41 2003
***************
*** 12,17 ****
--- 12,19 ----
nat_netclass to allow users to specify what IP's will see
the servers internal addresses and what IP's will see
the servers external address specified by ipnat option.
+ 5) Change: Added support for abbreviated netmasks, eg 192.168.0.0/24
+ instead of 192.168.0.0/255.255.0.0.
Version 1.3.13:
Index: muddleftpd/src/checkip.c
diff -c muddleftpd/src/checkip.c:1.1.8.1 muddleftpd/src/checkip.c:1.1.8.2
*** muddleftpd/src/checkip.c:1.1.8.1 Tue Nov 4 10:41:22 2003
--- muddleftpd/src/checkip.c Wed Nov 19 00:24:41 2003
***************
*** 56,61 ****
--- 56,63 ----
{
char *settingt = strdupwrapper(setting);
char *netmask, *ipaddr;
+ unsigned int maskbitc;
+ char wastechar;
strtrimspace(settingt);
ipaddr = strchr(settingt, ':');
***************
*** 89,95 ****
*netmask = 0;
netmask++;
getnetworkint(ipaddr,
&(new->list[new->count].ipaddr));
! getnetworkint(netmask,
&(new->list[new->count].netmask));
new->list[new->count].fnstr = NULL;
freewrapper(settingt);
new->list[new->count].type = 2;
--- 91,107 ----
*netmask = 0;
netmask++;
getnetworkint(ipaddr,
&(new->list[new->count].ipaddr));
!
! /* check for single number netmask */
! if (sscanf(netmask, "%u%c", &maskbitc,
&wastechar) == 1)
! {
! if (maskbitc <= 32)
! new->list[new->count].netmask =
0xFFFFFFFF << (32 - maskbitc);
! else
! getnetworkint(netmask,
&(new->list[new->count].netmask));
! }
! else
! getnetworkint(netmask,
&(new->list[new->count].netmask));
new->list[new->count].fnstr = NULL;
freewrapper(settingt);
new->list[new->count].type = 2;
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, (continued)
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Joerg Jaspert, 2003/11/06
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd,
Beau Kuiper <=
- [Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd, Beau Kuiper, 2003/11/19