|
@@ -315,7 +315,7 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
|
|
* manips not an issue.
|
|
* manips not an issue.
|
|
*/
|
|
*/
|
|
if (maniptype == NF_NAT_MANIP_SRC &&
|
|
if (maniptype == NF_NAT_MANIP_SRC &&
|
|
- !(range->flags & NF_NAT_RANGE_PROTO_RANDOM)) {
|
|
|
|
|
|
+ !(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) {
|
|
/* try the original tuple first */
|
|
/* try the original tuple first */
|
|
if (in_range(l3proto, l4proto, orig_tuple, range)) {
|
|
if (in_range(l3proto, l4proto, orig_tuple, range)) {
|
|
if (!nf_nat_used_tuple(orig_tuple, ct)) {
|
|
if (!nf_nat_used_tuple(orig_tuple, ct)) {
|
|
@@ -339,7 +339,7 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
|
|
*/
|
|
*/
|
|
|
|
|
|
/* Only bother mapping if it's not already in range and unique */
|
|
/* Only bother mapping if it's not already in range and unique */
|
|
- if (!(range->flags & NF_NAT_RANGE_PROTO_RANDOM)) {
|
|
|
|
|
|
+ if (!(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) {
|
|
if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) {
|
|
if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) {
|
|
if (l4proto->in_range(tuple, maniptype,
|
|
if (l4proto->in_range(tuple, maniptype,
|
|
&range->min_proto,
|
|
&range->min_proto,
|