all: remove trailing squatspaces

This commit is contained in:
Jan Engelhardt
2012-06-10 22:31:10 +02:00
parent 492236f931
commit 7cc774641a
7 changed files with 20 additions and 20 deletions

View File

@@ -47,8 +47,8 @@ and \fBlasthit\fR entries contain \fBS\fR in case of static binding.
\fB/proc/net/xt_DNETMAP/\fR\fIsubnet\fR\fB_\fR\fImask\fR\fB_stat\fR \fB/proc/net/xt_DNETMAP/\fR\fIsubnet\fR\fB_\fR\fImask\fR\fB_stat\fR
Contains statistics for given subnet/mask. Line contains contains four Contains statistics for given subnet/mask. Line contains contains four
numerical values separated by spaces. First one is number of currently used numerical values separated by spaces. First one is number of currently used
dynamic addresses (bindings with negative ttl excluded), second one is number dynamic addresses (bindings with negative ttl excluded), second one is number
static assignments, third one is number of all usable addresses in subnet and static assignments, third one is number of all usable addresses in subnet and
the fourth one is mean \fBttl\fR value for all active entries. If prefix has the fourth one is mean \fBttl\fR value for all active entries. If prefix has
persistent flag set it'll be noted as fifth entry. persistent flag set it'll be noted as fifth entry.
.PP .PP
@@ -77,7 +77,7 @@ echo "flush" > \fB/proc/net/xt_DNETMAP/subnet_mask\fR
Flushes all bindings for specific prefix. All static entries are also flushed Flushes all bindings for specific prefix. All static entries are also flushed
and are available for dynamic bindings. and are available for dynamic bindings.
.PP .PP
Note! Entries are removed if the last iptables rule for a specific prefix is Note! Entries are removed if the last iptables rule for a specific prefix is
deleted unless there's persistent flag set. deleted unless there's persistent flag set.
.PP .PP
@@ -147,7 +147,7 @@ using non-static entries.
iptables -t nat -A POSTROUTING -s 192.168.0.0/24 -j DNETMAP --prefix 20.0.0.0/26 iptables -t nat -A POSTROUTING -s 192.168.0.0/24 -j DNETMAP --prefix 20.0.0.0/26
--persistent --persistent
.br .br
\fBor\fR \fBor\fR
.br .br
iptables -t nat -A POSTROUTING -s 192.168.0.0/24 -j DNETMAP --prefix 20.0.0.0/26 iptables -t nat -A POSTROUTING -s 192.168.0.0/24 -j DNETMAP --prefix 20.0.0.0/26

View File

@@ -100,7 +100,7 @@ static void fuzzy_mt_save(const void *ip, const struct xt_entry_match *match)
printf(" --upper-limit %u ", info->maximum_rate); printf(" --upper-limit %u ", info->maximum_rate);
} }
static struct xtables_match fuzzy_mt_reg = { static struct xtables_match fuzzy_mt_reg = {
.name = "fuzzy", .name = "fuzzy",
.revision = 1, .revision = 1,
.version = XTABLES_VERSION, .version = XTABLES_VERSION,

View File

@@ -100,7 +100,7 @@ geoip_get_subnets(const char *code, uint32_t *count, uint8_t nfproto)
close(fd); close(fd);
return subnets; return subnets;
} }
static struct geoip_country_user *geoip_load_cc(const char *code, static struct geoip_country_user *geoip_load_cc(const char *code,
unsigned short cc, uint8_t nfproto) unsigned short cc, uint8_t nfproto)
{ {

View File

@@ -78,7 +78,7 @@ static void gradm_mt_save(const void *ip, const struct xt_entry_match *match)
printf(" --enabled "); printf(" --enabled ");
} }
static struct xtables_match gradm_mt_reg = { static struct xtables_match gradm_mt_reg = {
.family = NFPROTO_UNSPEC, .family = NFPROTO_UNSPEC,
.name = "gradm", .name = "gradm",
.version = XTABLES_VERSION, .version = XTABLES_VERSION,

View File

@@ -36,7 +36,7 @@ Matches some WinMX packets. Considered as beta, use careful!
Matches Ares and AresLite packets. Use together with \-j DROP only. Matches Ares and AresLite packets. Use together with \-j DROP only.
.TP .TP
\fB\-\-debug\fP \fB\-\-debug\fP
Prints some information about each hit into kernel logfile. May Prints some information about each hit into kernel logfile. May
produce huge logfiles so beware! produce huge logfiles so beware!
.PP .PP
Note that ipp2p may not (and often, does not) identify all packets that are Note that ipp2p may not (and often, does not) identify all packets that are

View File

@@ -633,7 +633,7 @@ dnetmap_tg_proc_write(struct file *file, const char __user *input,size_t size, l
__be32 addr1,addr2; __be32 addr1,addr2;
bool add; bool add;
char str[25]; char str[25];
if (size == 0) if (size == 0)
return 0; return 0;
if (size > sizeof(buf)) if (size > sizeof(buf))
@@ -642,7 +642,7 @@ dnetmap_tg_proc_write(struct file *file, const char __user *input,size_t size, l
return -EFAULT; return -EFAULT;
if(strcspn(c,"\n") < size) if(strcspn(c,"\n") < size)
buf[strcspn(c,"\n")]='\0'; buf[strcspn(c,"\n")]='\0';
/* Strict protocol! */ /* Strict protocol! */
if (*loff != 0) if (*loff != 0)
return -ESPIPE; return -ESPIPE;
@@ -696,10 +696,10 @@ dnetmap_tg_proc_write(struct file *file, const char __user *input,size_t size, l
c2 = strchr(c,':'); c2 = strchr(c,':');
if(c2 == NULL) if(c2 == NULL)
goto invalid_arg_unlock; goto invalid_arg_unlock;
c++; c++;
c2++; c2++;
if( ! (in4_pton(c2,strlen(c2),(void *)&addr2, '\0', NULL) && if( ! (in4_pton(c2,strlen(c2),(void *)&addr2, '\0', NULL) &&
in4_pton(c,strlen(c),(void *)&addr1, ':', NULL))) in4_pton(c,strlen(c),(void *)&addr1, ':', NULL)))
goto invalid_arg_unlock; goto invalid_arg_unlock;
@@ -731,7 +731,7 @@ dnetmap_tg_proc_write(struct file *file, const char __user *input,size_t size, l
break; break;
} }
} }
e->prenat_addr=addr1; e->prenat_addr=addr1;
e->flags |= XT_DNETMAP_STATIC; e->flags |= XT_DNETMAP_STATIC;
list_add_tail(&e->glist, list_add_tail(&e->glist,
@@ -742,7 +742,7 @@ dnetmap_tg_proc_write(struct file *file, const char __user *input,size_t size, l
dnetmap_entry_hash dnetmap_entry_hash
(e->postnat_addr)]); (e->postnat_addr)]);
list_del(&e->lru_list); list_del(&e->lru_list);
sprintf(str, NIPQUAD_FMT ":" NIPQUAD_FMT, NIPQUAD(addr1),NIPQUAD(addr2)); sprintf(str, NIPQUAD_FMT ":" NIPQUAD_FMT, NIPQUAD(addr1),NIPQUAD(addr2));
printk(KERN_INFO KBUILD_MODNAME ": adding static binding %s\n", str); printk(KERN_INFO KBUILD_MODNAME ": adding static binding %s\n", str);
@@ -755,7 +755,7 @@ dnetmap_tg_proc_write(struct file *file, const char __user *input,size_t size, l
e = dnetmap_entry_rlookup(p->dnetmap,addr1); e = dnetmap_entry_rlookup(p->dnetmap,addr1);
if(e == NULL) e = dnetmap_entry_lookup(p->dnetmap,addr1); if(e == NULL) e = dnetmap_entry_lookup(p->dnetmap,addr1);
if(e != NULL){ if(e != NULL){
if (!disable_log) if (!disable_log)
printk(KERN_INFO KBUILD_MODNAME printk(KERN_INFO KBUILD_MODNAME
@@ -773,7 +773,7 @@ dnetmap_tg_proc_write(struct file *file, const char __user *input,size_t size, l
goto invalid_arg_unlock; goto invalid_arg_unlock;
} }
} }
spin_unlock_bh(&dnetmap_lock); spin_unlock_bh(&dnetmap_lock);
/* Note we removed one above */ /* Note we removed one above */
@@ -782,7 +782,7 @@ dnetmap_tg_proc_write(struct file *file, const char __user *input,size_t size, l
invalid_arg_unlock: invalid_arg_unlock:
spin_unlock_bh(&dnetmap_lock); spin_unlock_bh(&dnetmap_lock);
invalid_arg: invalid_arg:
//printk(KERN_INFO KBUILD_MODNAME ": Need \"+prenat_ip:postnat_ip\", \"-ip\" or \"/\"\n"); //printk(KERN_INFO KBUILD_MODNAME ": Need \"+prenat_ip:postnat_ip\", \"-ip\" or \"/\"\n");
printk(KERN_INFO KBUILD_MODNAME ": Error! Invalid option passed via procfs.\n"); printk(KERN_INFO KBUILD_MODNAME ": Error! Invalid option passed via procfs.\n");
@@ -809,7 +809,7 @@ static int dnetmap_stat_proc_read(char __user *buffer, char **start,
long int ttl, sum_ttl; long int ttl, sum_ttl;
used=used_static=all=sum_ttl=0; used=used_static=all=sum_ttl=0;
spin_lock_bh(&dnetmap_lock); spin_lock_bh(&dnetmap_lock);
list_for_each_entry(e, &p->elist, list) { list_for_each_entry(e, &p->elist, list) {

View File

@@ -230,7 +230,7 @@ static struct xt_match quota_mt2_reg[] __read_mostly = {
.family = NFPROTO_IPV4, .family = NFPROTO_IPV4,
.checkentry = quota_mt2_check, .checkentry = quota_mt2_check,
.match = quota_mt2, .match = quota_mt2,
.destroy = quota_mt2_destroy, .destroy = quota_mt2_destroy,
.matchsize = sizeof(struct xt_quota_mtinfo2), .matchsize = sizeof(struct xt_quota_mtinfo2),
.me = THIS_MODULE, .me = THIS_MODULE,
}, },
@@ -240,7 +240,7 @@ static struct xt_match quota_mt2_reg[] __read_mostly = {
.family = NFPROTO_IPV6, .family = NFPROTO_IPV6,
.checkentry = quota_mt2_check, .checkentry = quota_mt2_check,
.match = quota_mt2, .match = quota_mt2,
.destroy = quota_mt2_destroy, .destroy = quota_mt2_destroy,
.matchsize = sizeof(struct xt_quota_mtinfo2), .matchsize = sizeof(struct xt_quota_mtinfo2),
.me = THIS_MODULE, .me = THIS_MODULE,
}, },