Attachment 187699 Details for Bug 265460 – Patch for kernel 2.6.29

[patch] Patch for kernel 2.6.29

ipp2p-0.8.2-kernel-2.6.29.patch (text/plain), 11.76 KB, created by manwe on 2009-04-08 16:19:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: manwe

Created: 2009-04-08 16:19:43 UTC

Size: 11.76 KB

patch

obsolete

>--- libipt_ipp2p.c.old	2009-04-08 18:03:26.574089860 +0200
>+++ libipt_ipp2p.c	2009-04-08 18:03:42.871884390 +0200
>@@ -88,39 +88,39 @@
>     switch (c) {
> 	case '1':		/*cmd: ipp2p*/
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified once!");
> /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p-data' may only be "
> 				"specified alone!");*/
> 	    if ((*flags) != 0)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
> 	    *flags += SHORT_HAND_IPP2P;
> 	    info->cmd = *flags;
> 	    break;
> 	    
> 	case '2':		/*cmd: edk*/
> 	    if ((*flags & IPP2P_EDK) == IPP2P_EDK)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--edk' may only be "
> 				"specified once");
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
> /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p-data' may only be "
> 				"specified alone!");*/
>             if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: use `--edk' OR `--edk-data' but not both of them!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
> 	    *flags += IPP2P_EDK;
> 	    info->cmd = *flags;	    
> 	    break;
>@@ -128,21 +128,21 @@
> 
> 	case '7':		/*cmd: dc*/
>             if ((*flags & IPP2P_DC) == IPP2P_DC)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--dc' may only be "
>                                 "specified once!");
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
> /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p-data' may only be "
> 				"specified alone!");*/
>             if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: use `--dc' OR `--dc-data' but not both of them!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_DC;
> 	    info->cmd = *flags;
> 	    break;
>@@ -150,70 +150,70 @@
> 
> 	case '9':		/*cmd: gnu*/
>             if ((*flags & IPP2P_GNU) == IPP2P_GNU)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--gnu' may only be "
>                                 "specified once!");
> /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p-data' may only be "
> 				"specified alone!");*/
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
>             if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_GNU;
> 	    info->cmd = *flags;
> 	    break;
> 
> 	case 'a':		/*cmd: kazaa*/
>             if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--kazaa' may only be "
>                                 "specified once!");
> /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p-data' may only be "
> 				"specified alone!");*/
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
>             if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_KAZAA;
> 	    info->cmd = *flags;
> 	    break;																											
> 
> 	case 'b':		/*cmd: bit*/
>             if ((*flags & IPP2P_BIT) == IPP2P_BIT)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--bit' may only be "
>                                 "specified once!");
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_BIT;
> 	    info->cmd = *flags;
> 	    break;																											
> 
> 	case 'c':		/*cmd: apple*/
>             if ((*flags & IPP2P_APPLE) == IPP2P_APPLE)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--apple' may only be "
>                                 "specified once!");
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_APPLE;
> 	    info->cmd = *flags;
> 	    break;																											
>@@ -221,14 +221,14 @@
> 
> 	case 'd':		/*cmd: soul*/
>             if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--soul' may only be "
>                                 "specified once!");
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_SOUL;
> 	    info->cmd = *flags;
> 	    break;																											
>@@ -236,67 +236,67 @@
> 
> 	case 'e':		/*cmd: winmx*/
>             if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--winmx' may only be "
>                                 "specified once!");
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_WINMX;
> 	    info->cmd = *flags;
> 	    break;																											
> 
> 	case 'f':		/*cmd: ares*/
>             if ((*flags & IPP2P_ARES) == IPP2P_ARES)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--ares' may only be "
>                                 "specified once!");
> 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
>-		    exit_error(PARAMETER_PROBLEM,
>+		    xtables_error(PARAMETER_PROBLEM,
> 				"ipp2p: `--ipp2p' may only be "
> 				"specified alone!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_ARES;
> 	    info->cmd = *flags;
> 	    break;																											
> 	
> 	case 'g':		/*cmd: mute*/
>             if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--mute' may only be "
>                                 "specified once!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_MUTE;
> 	    info->cmd = *flags;
> 	    break;																											
> 	case 'h':		/*cmd: waste*/
>             if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--waste' may only be "
>                                 "specified once!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_WASTE;
> 	    info->cmd = *flags;
> 	    break;																											
> 	case 'i':		/*cmd: xdcc*/
>             if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
>                                 "ipp2p: `--ares' may only be "
>                                 "specified once!");
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>             *flags += IPP2P_XDCC;
> 	    info->cmd = *flags;
> 	    break;																											
> 
> 	case 'j':		/*cmd: debug*/
>-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
>+	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
> 	    info->debug = 1;
> 	    break;																											
> 
> 	default:
>-//            exit_error(PARAMETER_PROBLEM,
>+//            xtables_error(PARAMETER_PROBLEM,
> //	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
> 	    return 0;
>     }
>@@ -308,7 +308,7 @@
> final_check(unsigned int flags)
> {
>     if (!flags)
>-            exit_error(PARAMETER_PROBLEM,
>+            xtables_error(PARAMETER_PROBLEM,
> 	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
> }
>

Actions: View | Diff

Attachments on bug 265460: 187699 | 189150