Changeset 3237


Ignore:
Timestamp:
2006-02-14T14:13:13+01:00 (12 years ago)
Author:
florian
Message:

Fixed ticket #310, unresolved symbol is fixed
Also fixed rtsp module, missing memchr symbol in kernel, needs complete kernel rebuilding to use.

Location:
branches/whiterussian/openwrt/target/linux/linux-2.4/patches/generic
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/whiterussian/openwrt/target/linux/linux-2.4/patches/generic/116-netfilter_nat_sip.patch

    r3181 r3237  
    245245+ 
    246246+       /* keep the connection alive */ 
    247 +       ip_ct_refresh_acct(ct, ctinfo, iph, (SIP_EXPIRES * HZ)); 
     247+       ip_ct_refresh(ct, (SIP_EXPIRES * HZ)); 
    248248+ 
    249249+       /* Don't need to set the expectation for upstream direction */ 
  • branches/whiterussian/openwrt/target/linux/linux-2.4/patches/generic/118-netfilter_nat_rtsp.patch

    r3181 r3237  
    11diff -urN linux-2.4.30/net/ipv4/netfilter/Config.in linux-2.4.30.new/net/ipv4/netfilter/Config.in 
    2 --- linux-2.4.30/net/ipv4/netfilter/Config.in   2006-02-07 15:44:46.000000000 +0100 
    3 +++ linux-2.4.30.new/net/ipv4/netfilter/Config.in       2006-02-07 15:46:07.000000000 +0100 
     2--- linux-2.4.30/net/ipv4/netfilter/Config.in   2006-02-14 14:02:20.000000000 +0100 
     3+++ linux-2.4.30.new/net/ipv4/netfilter/Config.in       2006-02-14 13:49:55.000000000 +0100 
    44@@ -15,6 +15,7 @@ 
    55   dep_tristate '   PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE 
     
    88+  dep_tristate '  RTSP protocol support' CONFIG_IP_NF_RTSP $CONFIG_IP_NF_CONNTRACK 
    99 fi 
    10  
     10  
    1111 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then 
    12 @@ -103,6 +103,13 @@ 
     12@@ -103,6 +104,13 @@ 
    1313          define_tristate CONFIG_IP_NF_NAT_H323 $CONFIG_IP_NF_NAT 
    1414        fi 
     
    2626diff -urN linux-2.4.30/net/ipv4/netfilter/ip_conntrack_rtsp.c linux-2.4.30.new/net/ipv4/netfilter/ip_conntrack_rtsp.c 
    2727--- linux-2.4.30/net/ipv4/netfilter/ip_conntrack_rtsp.c 1970-01-01 01:00:00.000000000 +0100 
    28 +++ linux-2.4.30.new/net/ipv4/netfilter/ip_conntrack_rtsp.c     2006-02-07 15:46:07.000000000 +0100 
     28+++ linux-2.4.30.new/net/ipv4/netfilter/ip_conntrack_rtsp.c     2006-02-14 13:49:55.000000000 +0100 
    2929@@ -0,0 +1,507 @@ 
    3030+/* 
     
    537537diff -urN linux-2.4.30/net/ipv4/netfilter/ip_nat_rtsp.c linux-2.4.30.new/net/ipv4/netfilter/ip_nat_rtsp.c 
    538538--- linux-2.4.30/net/ipv4/netfilter/ip_nat_rtsp.c       1970-01-01 01:00:00.000000000 +0100 
    539 +++ linux-2.4.30.new/net/ipv4/netfilter/ip_nat_rtsp.c   2006-02-07 15:46:07.000000000 +0100 
     539+++ linux-2.4.30.new/net/ipv4/netfilter/ip_nat_rtsp.c   2006-02-14 13:49:55.000000000 +0100 
    540540@@ -0,0 +1,621 @@ 
    541541+/* 
     
    11611161+module_exit(fini); 
    11621162diff -urN linux-2.4.30/net/ipv4/netfilter/Makefile linux-2.4.30.new/net/ipv4/netfilter/Makefile 
    1163 --- linux-2.4.30/net/ipv4/netfilter/Makefile    2006-02-07 15:44:46.000000000 +0100 
    1164 +++ linux-2.4.30.new/net/ipv4/netfilter/Makefile        2006-02-07 15:46:07.000000000 +0100 
     1163--- linux-2.4.30/net/ipv4/netfilter/Makefile    2006-02-14 14:02:20.000000000 +0100 
     1164+++ linux-2.4.30.new/net/ipv4/netfilter/Makefile        2006-02-14 13:49:55.000000000 +0100 
    11651165@@ -32,6 +32,14 @@ 
    11661166 obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o 
     
    11781178 ifdef CONFIG_IP_NF_AMANDA 
    11791179        export-objs += ip_conntrack_amanda.o 
     1180diff -urN linux-2.4.30/include/linux/netfilter_helpers.h linux-2.4.30.new/include/linux/netfilter_helpers.h 
     1181--- linux-2.4.30/include/linux/netfilter_helpers.h      1970-01-01 01:00:00.000000000 +0100 
     1182+++ linux-2.4.30.new/include/linux/netfilter_helpers.h  2006-02-14 13:49:55.000000000 +0100 
     1183@@ -0,0 +1,133 @@ 
     1184+/* 
     1185+ * Helpers for netfiler modules.  This file provides implementations for basic 
     1186+ * functions such as strncasecmp(), etc. 
     1187+ * 
     1188+ * gcc will warn for defined but unused functions, so we only include the 
     1189+ * functions requested.  The following macros are used: 
     1190+ *   NF_NEED_STRNCASECMP        nf_strncasecmp() 
     1191+ *   NF_NEED_STRTOU16           nf_strtou16() 
     1192+ *   NF_NEED_STRTOU32           nf_strtou32() 
     1193+ */ 
     1194+#ifndef _NETFILTER_HELPERS_H 
     1195+#define _NETFILTER_HELPERS_H 
     1196+ 
     1197+/* Only include these functions for kernel code. */ 
     1198+#ifdef __KERNEL__ 
     1199+ 
     1200+#include <linux/ctype.h> 
     1201+#define iseol(c) ( (c) == '\r' || (c) == '\n' ) 
     1202+ 
     1203+/* 
     1204+ * The standard strncasecmp() 
     1205+ */ 
     1206+#ifdef NF_NEED_STRNCASECMP 
     1207+static int 
     1208+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len) 
     1209+{ 
     1210+    if (s1 == NULL || s2 == NULL) 
     1211+    { 
     1212+        if (s1 == NULL && s2 == NULL) 
     1213+        { 
     1214+            return 0; 
     1215+        } 
     1216+        return (s1 == NULL) ? -1 : 1; 
     1217+    } 
     1218+    while (len > 0 && tolower(*s1) == tolower(*s2)) 
     1219+    { 
     1220+        len--; 
     1221+        s1++; 
     1222+        s2++; 
     1223+    } 
     1224+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) ); 
     1225+} 
     1226+#endif /* NF_NEED_STRNCASECMP */ 
     1227+ 
     1228+/* 
     1229+ * Parse a string containing a 16-bit unsigned integer. 
     1230+ * Returns the number of chars used, or zero if no number is found. 
     1231+ */ 
     1232+#ifdef NF_NEED_STRTOU16 
     1233+static int 
     1234+nf_strtou16(const char* pbuf, u_int16_t* pval) 
     1235+{ 
     1236+    int n = 0; 
     1237+ 
     1238+    *pval = 0; 
     1239+    while (isdigit(pbuf[n])) 
     1240+    { 
     1241+        *pval = (*pval * 10) + (pbuf[n] - '0'); 
     1242+        n++; 
     1243+    } 
     1244+ 
     1245+    return n; 
     1246+} 
     1247+#endif /* NF_NEED_STRTOU16 */ 
     1248+ 
     1249+/* 
     1250+ * Parse a string containing a 32-bit unsigned integer. 
     1251+ * Returns the number of chars used, or zero if no number is found. 
     1252+ */ 
     1253+#ifdef NF_NEED_STRTOU32 
     1254+static int 
     1255+nf_strtou32(const char* pbuf, u_int32_t* pval) 
     1256+{ 
     1257+    int n = 0; 
     1258+ 
     1259+    *pval = 0; 
     1260+    while (pbuf[n] >= '0' && pbuf[n] <= '9') 
     1261+    { 
     1262+        *pval = (*pval * 10) + (pbuf[n] - '0'); 
     1263+        n++; 
     1264+    } 
     1265+ 
     1266+    return n; 
     1267+} 
     1268+#endif /* NF_NEED_STRTOU32 */ 
     1269+ 
     1270+/* 
     1271+ * Given a buffer and length, advance to the next line and mark the current 
     1272+ * line. 
     1273+ */ 
     1274+#ifdef NF_NEED_NEXTLINE 
     1275+static int 
     1276+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen) 
     1277+{ 
     1278+    uint    off = *poff; 
     1279+    uint    physlen = 0; 
     1280+ 
     1281+    if (off >= len) 
     1282+    { 
     1283+        return 0; 
     1284+    } 
     1285+ 
     1286+    while (p[off] != '\n') 
     1287+    { 
     1288+        if (len-off <= 1) 
     1289+        { 
     1290+            return 0; 
     1291+        } 
     1292+ 
     1293+        physlen++; 
     1294+        off++; 
     1295+    } 
     1296+ 
     1297+    /* if we saw a crlf, physlen needs adjusted */ 
     1298+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r') 
     1299+    { 
     1300+        physlen--; 
     1301+    } 
     1302+ 
     1303+    /* advance past the newline */ 
     1304+    off++; 
     1305+ 
     1306+    *plineoff = *poff; 
     1307+    *plinelen = physlen; 
     1308+    *poff = off; 
     1309+ 
     1310+    return 1; 
     1311+} 
     1312+#endif /* NF_NEED_NEXTLINE */ 
     1313+ 
     1314+#endif /* __KERNEL__ */ 
     1315+ 
     1316+#endif /* _NETFILTER_HELPERS_H */ 
    11801317diff -urN linux-2.4.30/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack.h 
    1181 --- linux-2.4.30/include/linux/netfilter_ipv4/ip_conntrack.h    2006-02-07 15:44:46.000000000 +0100 
    1182 +++ linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack.h        2006-02-07 15:46:07.000000000 +0100 
     1318--- linux-2.4.30/include/linux/netfilter_ipv4/ip_conntrack.h    2006-02-14 14:02:20.000000000 +0100 
     1319+++ linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack.h        2006-02-14 13:49:55.000000000 +0100 
    11831320@@ -66,6 +66,7 @@ 
    11841321 }; 
     
    12071344diff -urN linux-2.4.30/include/linux/netfilter_ipv4/ip_conntrack.h.orig linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack.h.orig 
    12081345--- linux-2.4.30/include/linux/netfilter_ipv4/ip_conntrack.h.orig       1970-01-01 01:00:00.000000000 +0100 
    1209 +++ linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack.h.orig   2006-02-07 15:42:53.000000000 +0100 
     1346+++ linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack.h.orig   2006-02-14 13:49:55.000000000 +0100 
    12101347@@ -0,0 +1,297 @@ 
    12111348+#ifndef _IP_CONNTRACK_H 
     
    15081645diff -urN linux-2.4.30/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h 
    15091646--- linux-2.4.30/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h       1970-01-01 01:00:00.000000000 +0100 
    1510 +++ linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h   2006-02-07 15:46:07.000000000 +0100 
     1647+++ linux-2.4.30.new/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h   2006-02-14 13:49:55.000000000 +0100 
    15111648@@ -0,0 +1,68 @@ 
    15121649+/* 
     
    15781715+ 
    15791716+#endif /* _IP_CONNTRACK_RTSP_H */ 
    1580 diff -urN linux-2.4.30/include/linux/netfilter_helpers.h linux-2.4.30.new/include/linux/netfilter_helpers.h 
    1581 --- linux-2.4.30/include/linux/netfilter_helpers.h      1970-01-01 01:00:00.000000000 +0100 
    1582 +++ linux-2.4.30.new/include/linux/netfilter_helpers.h  2006-02-07 15:46:07.000000000 +0100 
    1583 @@ -0,0 +1,133 @@ 
    1584 +/* 
    1585 + * Helpers for netfiler modules.  This file provides implementations for basic 
    1586 + * functions such as strncasecmp(), etc. 
    1587 + * 
    1588 + * gcc will warn for defined but unused functions, so we only include the 
    1589 + * functions requested.  The following macros are used: 
    1590 + *   NF_NEED_STRNCASECMP        nf_strncasecmp() 
    1591 + *   NF_NEED_STRTOU16           nf_strtou16() 
    1592 + *   NF_NEED_STRTOU32           nf_strtou32() 
    1593 + */ 
    1594 +#ifndef _NETFILTER_HELPERS_H 
    1595 +#define _NETFILTER_HELPERS_H 
    1596 + 
    1597 +/* Only include these functions for kernel code. */ 
    1598 +#ifdef __KERNEL__ 
    1599 + 
    1600 +#include <linux/ctype.h> 
    1601 +#define iseol(c) ( (c) == '\r' || (c) == '\n' ) 
    1602 + 
    1603 +/* 
    1604 + * The standard strncasecmp() 
    1605 + */ 
    1606 +#ifdef NF_NEED_STRNCASECMP 
    1607 +static int 
    1608 +nf_strncasecmp(const char* s1, const char* s2, u_int32_t len) 
    1609 +{ 
    1610 +    if (s1 == NULL || s2 == NULL) 
    1611 +    { 
    1612 +        if (s1 == NULL && s2 == NULL) 
    1613 +        { 
    1614 +            return 0; 
    1615 +        } 
    1616 +        return (s1 == NULL) ? -1 : 1; 
    1617 +    } 
    1618 +    while (len > 0 && tolower(*s1) == tolower(*s2)) 
    1619 +    { 
    1620 +        len--; 
    1621 +        s1++; 
    1622 +        s2++; 
    1623 +    } 
    1624 +    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) ); 
    1625 +} 
    1626 +#endif /* NF_NEED_STRNCASECMP */ 
    1627 + 
    1628 +/* 
    1629 + * Parse a string containing a 16-bit unsigned integer. 
    1630 + * Returns the number of chars used, or zero if no number is found. 
    1631 + */ 
    1632 +#ifdef NF_NEED_STRTOU16 
    1633 +static int 
    1634 +nf_strtou16(const char* pbuf, u_int16_t* pval) 
    1635 +{ 
    1636 +    int n = 0; 
    1637 + 
    1638 +    *pval = 0; 
    1639 +    while (isdigit(pbuf[n])) 
    1640 +    { 
    1641 +        *pval = (*pval * 10) + (pbuf[n] - '0'); 
    1642 +        n++; 
    1643 +    } 
    1644 + 
    1645 +    return n; 
    1646 +} 
    1647 +#endif /* NF_NEED_STRTOU16 */ 
    1648 + 
    1649 +/* 
    1650 + * Parse a string containing a 32-bit unsigned integer. 
    1651 + * Returns the number of chars used, or zero if no number is found. 
    1652 + */ 
    1653 +#ifdef NF_NEED_STRTOU32 
    1654 +static int 
    1655 +nf_strtou32(const char* pbuf, u_int32_t* pval) 
    1656 +{ 
    1657 +    int n = 0; 
    1658 + 
    1659 +    *pval = 0; 
    1660 +    while (pbuf[n] >= '0' && pbuf[n] <= '9') 
    1661 +    { 
    1662 +        *pval = (*pval * 10) + (pbuf[n] - '0'); 
    1663 +        n++; 
    1664 +    } 
    1665 + 
    1666 +    return n; 
    1667 +} 
    1668 +#endif /* NF_NEED_STRTOU32 */ 
    1669 + 
    1670 +/* 
    1671 + * Given a buffer and length, advance to the next line and mark the current 
    1672 + * line. 
    1673 + */ 
    1674 +#ifdef NF_NEED_NEXTLINE 
    1675 +static int 
    1676 +nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen) 
    1677 +{ 
    1678 +    uint    off = *poff; 
    1679 +    uint    physlen = 0; 
    1680 + 
    1681 +    if (off >= len) 
    1682 +    { 
    1683 +        return 0; 
    1684 +    } 
    1685 + 
    1686 +    while (p[off] != '\n') 
    1687 +    { 
    1688 +        if (len-off <= 1) 
    1689 +        { 
    1690 +            return 0; 
    1691 +        } 
    1692 + 
    1693 +        physlen++; 
    1694 +        off++; 
    1695 +    } 
    1696 + 
    1697 +    /* if we saw a crlf, physlen needs adjusted */ 
    1698 +    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r') 
    1699 +    { 
    1700 +        physlen--; 
    1701 +    } 
    1702 + 
    1703 +    /* advance past the newline */ 
    1704 +    off++; 
    1705 + 
    1706 +    *plineoff = *poff; 
    1707 +    *plinelen = physlen; 
    1708 +    *poff = off; 
    1709 + 
    1710 +    return 1; 
    1711 +} 
    1712 +#endif /* NF_NEED_NEXTLINE */ 
    1713 + 
    1714 +#endif /* __KERNEL__ */ 
    1715 + 
    1716 +#endif /* _NETFILTER_HELPERS_H */ 
    17171717diff -urN linux-2.4.30/include/linux/netfilter_mime.h linux-2.4.30.new/include/linux/netfilter_mime.h 
    17181718--- linux-2.4.30/include/linux/netfilter_mime.h 1970-01-01 01:00:00.000000000 +0100 
    1719 +++ linux-2.4.30.new/include/linux/netfilter_mime.h     2006-02-07 15:46:07.000000000 +0100 
     1719+++ linux-2.4.30.new/include/linux/netfilter_mime.h     2006-02-14 13:49:55.000000000 +0100 
    17201720@@ -0,0 +1,90 @@ 
    17211721+/* 
     
    18091809+ 
    18101810+#endif /* _NETFILTER_MIME_H */ 
     1811diff -urN linux-2.4.30/arch/mips/kernel/mips_ksyms.c linux-2.4.30.new/arch/mips/kernel/mips_ksyms.c 
     1812--- linux-2.4.30/arch/mips/kernel/mips_ksyms.c  2004-02-18 14:36:30.000000000 +0100 
     1813+++ linux-2.4.30.new/arch/mips/kernel/mips_ksyms.c      2006-02-14 13:50:27.000000000 +0100 
     1814@@ -48,6 +48,7 @@ 
     1815 /* 
     1816  * String functions 
     1817  */ 
     1818+EXPORT_SYMBOL_NOVERS(memchr); 
     1819 EXPORT_SYMBOL_NOVERS(memcmp); 
     1820 EXPORT_SYMBOL_NOVERS(memset); 
     1821 EXPORT_SYMBOL_NOVERS(memcpy); 
Note: See TracChangeset for help on using the changeset viewer.