gateway: push an if condition into its nested if's
authorFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 23 Aug 2012 12:31:54 +0000 (14:31 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 24 Aug 2012 08:50:04 +0000 (10:50 +0200)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
src/gateway.c

index 3f91cd7..5244e8f 100644 (file)
@@ -493,15 +493,13 @@ bool olsr_set_inet_gateway(union olsr_ip_addr *originator, bool ipv4, bool ipv6)
   }
 
   entry = node2gateway(avl_find(&gateway_tree, originator));
-  if (entry != NULL) {
-    if (ipv4 && entry->ipv4 && (!entry->ipv4nat || olsr_cnf->smart_gw_allow_nat)) {
-      /* valid ipv4 gateway */
-      current_ipv4_gw = entry;
-    }
-    if (ipv6 && entry->ipv6) {
-      /* valid ipv6 gateway */
-      current_ipv6_gw = entry;
-    }
+  if (entry != NULL && ipv4 && entry->ipv4 && (!entry->ipv4nat || olsr_cnf->smart_gw_allow_nat)) {
+    /* valid ipv4 gateway */
+    current_ipv4_gw = entry;
+  }
+  if (entry != NULL && ipv6 && entry->ipv6) {
+    /* valid ipv6 gateway */
+    current_ipv6_gw = entry;
   }
 
   /* handle IPv4 */