Tc

Author: msune

src/sfunnel.c

@@ -319,6 +319,11 @@ int redirect_seg_pkt(struct __sk_buff* skb, bool ingress, __u16 rule_id){
 
 	skb->mark = ingress ? PKT_REDIR_INGRESS : PKT_REDIR_EGRESS;
 	skb->mark |= rule_id;
+
+	PRINTK("[%d:0x%p] Redirecting %d->%d mark: 0x%x", skb->ifindex, skb,
+							skb->ifindex,
+							SEG_DEV_IFINDEX,
+							skb->mark);
 	return bpf_redirect(SEG_DEV_IFINDEX, 0);
 }
 
@@ -347,20 +352,20 @@ int proc_ip4(struct __sk_buff* skb, bool ingress, __u8* eth, struct iphdr* ip){
 		//egress iface
 		if(skb->mark&PKT_REDIR_EGRESS &&
 		   skb->ifindex == SEG_PAIR_DEV_IFINDEX){
-			PRINTK("[%d:0x%p] Skipping recirculated pkt coming from EGRESS program",
+			PRINTK("[%d:0x%p] Skipping redirected pkt coming from EGRESS program",
 							skb->ifindex, skb);
 			return TC_ACT_UNSPEC;
 		}
 
 		if(skb->gso_size > 0){
 			//The packet has been redirected before, but is looped
 			//back GSOed => drop (bug)
-			PRINTK("[%d:0x%p] Recirculated pkt is still GSOed",
+			PRINTK("[%d:0x%p] Redirected pkt is still GSOed",
 							skb->ifindex, skb);
 			return TC_ACT_SHOT;
 		}
 
-		PRINTK("[%d:0x%p] Processing %s recirculated pkt, mark: 0x%x",
+		PRINTK("[%d:0x%p] Processing redirected pkt from %s, mark: 0x%x",
 			skb->ifindex,
 			skb,
 			skb->mark&PKT_REDIR_EGRESS? "EGRESS" : "INGRESS",
@@ -375,6 +380,9 @@ int proc_ip4(struct __sk_buff* skb, bool ingress, __u8* eth, struct iphdr* ip){
 		}
 		rule = &ip4_rules[index];
 		skb->mark &= ~(0xFFFF | PKT_REDIR);
+
+		PRINTK("[%d:0x%p] Cached matched rule#%u %s", skb->ifindex, skb,
+								rule->id);
 	}else{
 		PRINTK("[%d:0x%p] Looking up IP4/%s, size %d", skb->ifindex, skb,
 						(ip->protocol == IPPROTO_UDP)?
@@ -385,11 +393,11 @@ int proc_ip4(struct __sk_buff* skb, bool ingress, __u8* eth, struct iphdr* ip){
 			PRINTK("[%d:0x%p] No match", skb->ifindex, skb);
 			return TC_ACT_UNSPEC;
 		}
+
+		PRINTK("[%d:0x%p] Matched rule#%u", skb->ifindex, skb, rule->id);
 		if(SEG_DEV_IFINDEX > 0)
 			return redirect_seg_pkt(skb, ingress, rule->id);
 	}
-	PRINTK("[%d:0x%p] Matched rule#%u %s", skb->ifindex, skb, rule->id,
-				skb->mark&PKT_REDIR ? "(cached)" : "");
 
 	//Direct actions
 	if(rule->actions.drop.execute){