diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-04-16 08:48:19 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-04-16 08:48:19 +0000 |
| commit | 6b9e04991d241fdafbdf9e899e4ea1ac2c4f5cd4 (patch) | |
| tree | e4b2fdeebbab2c1a6567bfb33de44d6bab22a71d /package/busybox/patches/000-upstream-dnsd.patch | |
| parent | f1eb6dd095b40b5f85f92cf031c2d17414ee26b2 (diff) | |
| download | upstream-6b9e04991d241fdafbdf9e899e4ea1ac2c4f5cd4.tar.gz upstream-6b9e04991d241fdafbdf9e899e4ea1ac2c4f5cd4.tar.bz2 upstream-6b9e04991d241fdafbdf9e899e4ea1ac2c4f5cd4.zip | |
package/busybox: add 3 upstream fixes, bump release number
SVN-Revision: 20904
Diffstat (limited to 'package/busybox/patches/000-upstream-dnsd.patch')
| -rw-r--r-- | package/busybox/patches/000-upstream-dnsd.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/package/busybox/patches/000-upstream-dnsd.patch b/package/busybox/patches/000-upstream-dnsd.patch new file mode 100644 index 0000000000..25458cae68 --- /dev/null +++ b/package/busybox/patches/000-upstream-dnsd.patch @@ -0,0 +1,27 @@ +--- a/include/platform.h ++++ b/include/platform.h +@@ -291,10 +291,12 @@ typedef unsigned smalluint; + #if 1 /* if needed: !defined(arch1) && !defined(arch2) */ + # define ALIGN1 __attribute__((aligned(1))) + # define ALIGN2 __attribute__((aligned(2))) ++# define ALIGN4 __attribute__((aligned(4))) + #else + /* Arches which MUST have 2 or 4 byte alignment for everything are here */ + # define ALIGN1 + # define ALIGN2 ++# define ALIGN4 + #endif + + +--- a/networking/dnsd.c ++++ b/networking/dnsd.c +@@ -459,7 +459,8 @@ int dnsd_main(int argc UNUSED_PARAM, cha + unsigned lsa_size; + int udps, opts; + uint16_t port = 53; +- uint8_t buf[MAX_PACK_LEN + 1]; ++ /* Ensure buf is 32bit aligned (we need 16bit, but 32bit can't hurt) */ ++ uint8_t buf[MAX_PACK_LEN + 1] ALIGN4; + + opts = getopt32(argv, "vi:c:t:p:d", &listen_interface, &fileconf, &sttl, &sport); + //if (opts & 0x1) // -v |