~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/net/netfilter/xt_rateest.c

Version: ~ [ linux-5.4-rc3 ] ~ [ linux-5.3.6 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.79 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.149 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.196 ] ~ [ linux-4.8.17 ] ~ [ linux-4.7.10 ] ~ [ linux-4.6.7 ] ~ [ linux-4.5.7 ] ~ [ linux-4.4.196 ] ~ [ linux-4.3.6 ] ~ [ linux-4.2.8 ] ~ [ linux-4.1.52 ] ~ [ linux-4.0.9 ] ~ [ linux-3.19.8 ] ~ [ linux-3.18.140 ] ~ [ linux-3.17.8 ] ~ [ linux-3.16.75 ] ~ [ linux-3.15.10 ] ~ [ linux-3.14.79 ] ~ [ linux-3.13.11 ] ~ [ linux-3.12.74 ] ~ [ linux-3.11.10 ] ~ [ linux-3.10.108 ] ~ [ linux-3.9.11 ] ~ [ linux-3.8.13 ] ~ [ linux-3.7.10 ] ~ [ linux-3.6.11 ] ~ [ linux-3.5.7 ] ~ [ linux-3.4.113 ] ~ [ linux-3.3.8 ] ~ [ linux-3.2.102 ] ~ [ linux-3.1.10 ] ~ [ linux-3.0.101 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.5 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /net/netfilter/xt_rateest.c (Version linux-4.10.17) and /net/netfilter/xt_rateest.c (Version linux-3.17.8)


  1 /*                                                  1 /*
  2  * (C) 2007 Patrick McHardy <kaber@trash.net>       2  * (C) 2007 Patrick McHardy <kaber@trash.net>
  3  *                                                  3  *
  4  * This program is free software; you can redi      4  * This program is free software; you can redistribute it and/or modify
  5  * it under the terms of the GNU General Publi      5  * it under the terms of the GNU General Public License version 2 as
  6  * published by the Free Software Foundation.       6  * published by the Free Software Foundation.
  7  */                                                 7  */
  8 #include <linux/module.h>                           8 #include <linux/module.h>
  9 #include <linux/skbuff.h>                           9 #include <linux/skbuff.h>
 10 #include <linux/gen_stats.h>                       10 #include <linux/gen_stats.h>
 11                                                    11 
 12 #include <linux/netfilter/x_tables.h>              12 #include <linux/netfilter/x_tables.h>
 13 #include <linux/netfilter/xt_rateest.h>            13 #include <linux/netfilter/xt_rateest.h>
 14 #include <net/netfilter/xt_rateest.h>              14 #include <net/netfilter/xt_rateest.h>
 15                                                    15 
 16                                                    16 
 17 static bool                                        17 static bool
 18 xt_rateest_mt(const struct sk_buff *skb, struc     18 xt_rateest_mt(const struct sk_buff *skb, struct xt_action_param *par)
 19 {                                                  19 {
 20         const struct xt_rateest_match_info *in     20         const struct xt_rateest_match_info *info = par->matchinfo;
 21         struct gnet_stats_rate_est64 sample =  !!  21         struct gnet_stats_rate_est64 *r;
 22         u_int32_t bps1, bps2, pps1, pps2;          22         u_int32_t bps1, bps2, pps1, pps2;
 23         bool ret = true;                           23         bool ret = true;
 24                                                    24 
 25         gen_estimator_read(&info->est1->rate_e !!  25         spin_lock_bh(&info->est1->lock);
 26                                                !!  26         r = &info->est1->rstats;
 27         if (info->flags & XT_RATEEST_MATCH_DEL     27         if (info->flags & XT_RATEEST_MATCH_DELTA) {
 28                 bps1 = info->bps1 >= sample.bp !!  28                 bps1 = info->bps1 >= r->bps ? info->bps1 - r->bps : 0;
 29                 pps1 = info->pps1 >= sample.pp !!  29                 pps1 = info->pps1 >= r->pps ? info->pps1 - r->pps : 0;
 30         } else {                                   30         } else {
 31                 bps1 = sample.bps;             !!  31                 bps1 = r->bps;
 32                 pps1 = sample.pps;             !!  32                 pps1 = r->pps;
 33         }                                          33         }
                                                   >>  34         spin_unlock_bh(&info->est1->lock);
 34                                                    35 
 35         if (info->flags & XT_RATEEST_MATCH_ABS     36         if (info->flags & XT_RATEEST_MATCH_ABS) {
 36                 bps2 = info->bps2;                 37                 bps2 = info->bps2;
 37                 pps2 = info->pps2;                 38                 pps2 = info->pps2;
 38         } else {                                   39         } else {
 39                 gen_estimator_read(&info->est2 !!  40                 spin_lock_bh(&info->est2->lock);
 40                                                !!  41                 r = &info->est2->rstats;
 41                 if (info->flags & XT_RATEEST_M     42                 if (info->flags & XT_RATEEST_MATCH_DELTA) {
 42                         bps2 = info->bps2 >= s !!  43                         bps2 = info->bps2 >= r->bps ? info->bps2 - r->bps : 0;
 43                         pps2 = info->pps2 >= s !!  44                         pps2 = info->pps2 >= r->pps ? info->pps2 - r->pps : 0;
 44                 } else {                           45                 } else {
 45                         bps2 = sample.bps;     !!  46                         bps2 = r->bps;
 46                         pps2 = sample.pps;     !!  47                         pps2 = r->pps;
 47                 }                                  48                 }
                                                   >>  49                 spin_unlock_bh(&info->est2->lock);
 48         }                                          50         }
 49                                                    51 
 50         switch (info->mode) {                      52         switch (info->mode) {
 51         case XT_RATEEST_MATCH_LT:                  53         case XT_RATEEST_MATCH_LT:
 52                 if (info->flags & XT_RATEEST_M     54                 if (info->flags & XT_RATEEST_MATCH_BPS)
 53                         ret &= bps1 < bps2;        55                         ret &= bps1 < bps2;
 54                 if (info->flags & XT_RATEEST_M     56                 if (info->flags & XT_RATEEST_MATCH_PPS)
 55                         ret &= pps1 < pps2;        57                         ret &= pps1 < pps2;
 56                 break;                             58                 break;
 57         case XT_RATEEST_MATCH_GT:                  59         case XT_RATEEST_MATCH_GT:
 58                 if (info->flags & XT_RATEEST_M     60                 if (info->flags & XT_RATEEST_MATCH_BPS)
 59                         ret &= bps1 > bps2;        61                         ret &= bps1 > bps2;
 60                 if (info->flags & XT_RATEEST_M     62                 if (info->flags & XT_RATEEST_MATCH_PPS)
 61                         ret &= pps1 > pps2;        63                         ret &= pps1 > pps2;
 62                 break;                             64                 break;
 63         case XT_RATEEST_MATCH_EQ:                  65         case XT_RATEEST_MATCH_EQ:
 64                 if (info->flags & XT_RATEEST_M     66                 if (info->flags & XT_RATEEST_MATCH_BPS)
 65                         ret &= bps1 == bps2;       67                         ret &= bps1 == bps2;
 66                 if (info->flags & XT_RATEEST_M     68                 if (info->flags & XT_RATEEST_MATCH_PPS)
 67                         ret &= pps1 == pps2;       69                         ret &= pps1 == pps2;
 68                 break;                             70                 break;
 69         }                                          71         }
 70                                                    72 
 71         ret ^= info->flags & XT_RATEEST_MATCH_     73         ret ^= info->flags & XT_RATEEST_MATCH_INVERT ? true : false;
 72         return ret;                                74         return ret;
 73 }                                                  75 }
 74                                                    76 
 75 static int xt_rateest_mt_checkentry(const stru     77 static int xt_rateest_mt_checkentry(const struct xt_mtchk_param *par)
 76 {                                                  78 {
 77         struct xt_rateest_match_info *info = p     79         struct xt_rateest_match_info *info = par->matchinfo;
 78         struct xt_rateest *est1, *est2;            80         struct xt_rateest *est1, *est2;
 79         int ret = -EINVAL;                         81         int ret = -EINVAL;
 80                                                    82 
 81         if (hweight32(info->flags & (XT_RATEES     83         if (hweight32(info->flags & (XT_RATEEST_MATCH_ABS |
 82                                      XT_RATEES     84                                      XT_RATEEST_MATCH_REL)) != 1)
 83                 goto err1;                         85                 goto err1;
 84                                                    86 
 85         if (!(info->flags & (XT_RATEEST_MATCH_     87         if (!(info->flags & (XT_RATEEST_MATCH_BPS | XT_RATEEST_MATCH_PPS)))
 86                 goto err1;                         88                 goto err1;
 87                                                    89 
 88         switch (info->mode) {                      90         switch (info->mode) {
 89         case XT_RATEEST_MATCH_EQ:                  91         case XT_RATEEST_MATCH_EQ:
 90         case XT_RATEEST_MATCH_LT:                  92         case XT_RATEEST_MATCH_LT:
 91         case XT_RATEEST_MATCH_GT:                  93         case XT_RATEEST_MATCH_GT:
 92                 break;                             94                 break;
 93         default:                                   95         default:
 94                 goto err1;                         96                 goto err1;
 95         }                                          97         }
 96                                                    98 
 97         ret  = -ENOENT;                            99         ret  = -ENOENT;
 98         est1 = xt_rateest_lookup(info->name1);    100         est1 = xt_rateest_lookup(info->name1);
 99         if (!est1)                                101         if (!est1)
100                 goto err1;                        102                 goto err1;
101                                                   103 
102         est2 = NULL;                              104         est2 = NULL;
103         if (info->flags & XT_RATEEST_MATCH_REL    105         if (info->flags & XT_RATEEST_MATCH_REL) {
104                 est2 = xt_rateest_lookup(info-    106                 est2 = xt_rateest_lookup(info->name2);
105                 if (!est2)                        107                 if (!est2)
106                         goto err2;                108                         goto err2;
107         }                                         109         }
108                                                   110 
109         info->est1 = est1;                        111         info->est1 = est1;
110         info->est2 = est2;                        112         info->est2 = est2;
111         return 0;                                 113         return 0;
112                                                   114 
113 err2:                                             115 err2:
114         xt_rateest_put(est1);                     116         xt_rateest_put(est1);
115 err1:                                             117 err1:
116         return ret;                               118         return ret;
117 }                                                 119 }
118                                                   120 
119 static void xt_rateest_mt_destroy(const struct    121 static void xt_rateest_mt_destroy(const struct xt_mtdtor_param *par)
120 {                                                 122 {
121         struct xt_rateest_match_info *info = p    123         struct xt_rateest_match_info *info = par->matchinfo;
122                                                   124 
123         xt_rateest_put(info->est1);               125         xt_rateest_put(info->est1);
124         if (info->est2)                           126         if (info->est2)
125                 xt_rateest_put(info->est2);       127                 xt_rateest_put(info->est2);
126 }                                                 128 }
127                                                   129 
128 static struct xt_match xt_rateest_mt_reg __rea    130 static struct xt_match xt_rateest_mt_reg __read_mostly = {
129         .name       = "rateest",                  131         .name       = "rateest",
130         .revision   = 0,                          132         .revision   = 0,
131         .family     = NFPROTO_UNSPEC,             133         .family     = NFPROTO_UNSPEC,
132         .match      = xt_rateest_mt,              134         .match      = xt_rateest_mt,
133         .checkentry = xt_rateest_mt_checkentry    135         .checkentry = xt_rateest_mt_checkentry,
134         .destroy    = xt_rateest_mt_destroy,      136         .destroy    = xt_rateest_mt_destroy,
135         .matchsize  = sizeof(struct xt_rateest    137         .matchsize  = sizeof(struct xt_rateest_match_info),
136         .me         = THIS_MODULE,                138         .me         = THIS_MODULE,
137 };                                                139 };
138                                                   140 
139 static int __init xt_rateest_mt_init(void)        141 static int __init xt_rateest_mt_init(void)
140 {                                                 142 {
141         return xt_register_match(&xt_rateest_m    143         return xt_register_match(&xt_rateest_mt_reg);
142 }                                                 144 }
143                                                   145 
144 static void __exit xt_rateest_mt_fini(void)       146 static void __exit xt_rateest_mt_fini(void)
145 {                                                 147 {
146         xt_unregister_match(&xt_rateest_mt_reg    148         xt_unregister_match(&xt_rateest_mt_reg);
147 }                                                 149 }
148                                                   150 
149 MODULE_AUTHOR("Patrick McHardy <kaber@trash.ne    151 MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
150 MODULE_LICENSE("GPL");                            152 MODULE_LICENSE("GPL");
151 MODULE_DESCRIPTION("xtables rate estimator mat    153 MODULE_DESCRIPTION("xtables rate estimator match");
152 MODULE_ALIAS("ipt_rateest");                      154 MODULE_ALIAS("ipt_rateest");
153 MODULE_ALIAS("ip6t_rateest");                     155 MODULE_ALIAS("ip6t_rateest");
154 module_init(xt_rateest_mt_init);                  156 module_init(xt_rateest_mt_init);
155 module_exit(xt_rateest_mt_fini);                  157 module_exit(xt_rateest_mt_fini);
156                                                   158 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | Wiki (Japanese) | Wiki (English) | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

osdn.jp