012-msghdr.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. Patch from nsz via #musl
  2. Fixes mips64 big endian n64 issue with ip
  3. --- busybox-1.24.2.orig/networking/libiproute/libnetlink.c
  4. +++ busybox-1.24.2/networking/libiproute/libnetlink.c
  5. @@ -72,10 +72,10 @@
  6. struct sockaddr_nl nladdr;
  7. struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
  8. struct msghdr msg = {
  9. - (void*)&nladdr, sizeof(nladdr),
  10. - iov, 2,
  11. - NULL, 0,
  12. - 0
  13. + .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr),
  14. + .msg_iov = iov, .msg_iovlen = 2,
  15. + .msg_control = NULL, .msg_controllen = 0,
  16. + .msg_flags = 0
  17. };
  18. memset(&nladdr, 0, sizeof(nladdr));
  19. @@ -106,10 +106,10 @@
  20. struct nlmsghdr *h;
  21. struct msghdr msg = {
  22. - (void*)&nladdr, sizeof(nladdr),
  23. - &iov, 1,
  24. - NULL, 0,
  25. - 0
  26. + .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr),
  27. + .msg_iov = &iov, .msg_iovlen = 1,
  28. + .msg_control = NULL, .msg_controllen = 0,
  29. + .msg_flags = 0
  30. };
  31. status = recvmsg(rth->fd, &msg, 0);
  32. @@ -212,10 +212,10 @@
  33. struct iovec iov = { (void*)n, n->nlmsg_len };
  34. char *buf = xmalloc(8*1024); /* avoid big stack buffer */
  35. struct msghdr msg = {
  36. - (void*)&nladdr, sizeof(nladdr),
  37. - &iov, 1,
  38. - NULL, 0,
  39. - 0
  40. + .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr),
  41. + .msg_iov = &iov, .msg_iovlen = 1,
  42. + .msg_control = NULL, .msg_controllen = 0,
  43. + .msg_flags = 0
  44. };
  45. memset(&nladdr, 0, sizeof(nladdr));