diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-07 01:28:14 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-07 01:28:14 +0000 |
commit | 360fc8ba4b531ca44e553be6259c44afc3862175 (patch) | |
tree | b0d7cf37e2070a7bf5a2f8f3b0625c3774501966 | |
parent | 28018fba86d34a2f772c078fe93498a374dbbd55 (diff) | |
download | px4-nuttx-360fc8ba4b531ca44e553be6259c44afc3862175.tar.gz px4-nuttx-360fc8ba4b531ca44e553be6259c44afc3862175.tar.bz2 px4-nuttx-360fc8ba4b531ca44e553be6259c44afc3862175.zip |
RPC updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4460 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | nuttx/fs/nfs/rpc.h | 10 | ||||
-rw-r--r-- | nuttx/fs/nfs/rpc_idgen_sub.c | 192 | ||||
-rw-r--r-- | nuttx/fs/nfs/rpc_subr.c | 124 |
3 files changed, 42 insertions, 284 deletions
diff --git a/nuttx/fs/nfs/rpc.h b/nuttx/fs/nfs/rpc.h index a08923d01..db29007fd 100644 --- a/nuttx/fs/nfs/rpc.h +++ b/nuttx/fs/nfs/rpc.h @@ -71,12 +71,12 @@ ****************************************************************************/ int krpc_call(struct sockaddr_in *, unsigned int, unsigned int, unsigned int, - int); + struct sockaddr **, int); int krpc_portmap(struct sockaddr_in *, unsigned int, unsigned int, uint16_t *); -struct mbuf *xdr_string_encode(char *, int); -struct mbuf *xdr_string_decode(struct mbuf *, char *, int *); -struct mbuf *xdr_inaddr_encode(struct in_addr *); -struct mbuf *xdr_inaddr_decode(struct mbuf *, struct in_addr *); +void xdr_string_encode(char *, int); +void xdr_string_decode(char *, int *); +void xdr_inaddr_encode(struct in_addr *); +void xdr_inaddr_decode(struct in_addr *); #endif /* __FS_NFS_RPC_H */ diff --git a/nuttx/fs/nfs/rpc_idgen_sub.c b/nuttx/fs/nfs/rpc_idgen_sub.c deleted file mode 100644 index 99b400783..000000000 --- a/nuttx/fs/nfs/rpc_idgen_sub.c +++ /dev/null @@ -1,192 +0,0 @@ -/**************************************************************************** - * fs/nfs/rpc_subr.c - * Non-repeating ID generation covering an almost maximal 32 bit range. - * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. - * Copyright (C) 2012 Jose Pablo Rojas Vargas. All rights reserved. - * Author: Jose Pablo Rojas Vargas <jrojas@nx-engineering.com> - * - * Leveraged from OpenBSD: - * - * Copyright (c) 2008 Damien Miller <djm@mindrot.org> - * Based on public domain SKIP32 by Greg Rose. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <sys/types.h> -#include <stdio.h> -#include <stdlib.h> -#include <sys/time.h> -#include <string.h> - -#include"rpc_idgen.h" - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -static const uint8_t ftable[256] = -{ - 0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4, - 0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9, - 0xe7, 0x2d, 0x4d, 0x8a, 0xce, 0x4c, 0xca, 0x2e, - 0x52, 0x95, 0xd9, 0x1e, 0x4e, 0x38, 0x44, 0x28, - 0x0a, 0xdf, 0x02, 0xa0, 0x17, 0xf1, 0x60, 0x68, - 0x12, 0xb7, 0x7a, 0xc3, 0xe9, 0xfa, 0x3d, 0x53, - 0x96, 0x84, 0x6b, 0xba, 0xf2, 0x63, 0x9a, 0x19, - 0x7c, 0xae, 0xe5, 0xf5, 0xf7, 0x16, 0x6a, 0xa2, - 0x39, 0xb6, 0x7b, 0x0f, 0xc1, 0x93, 0x81, 0x1b, - 0xee, 0xb4, 0x1a, 0xea, 0xd0, 0x91, 0x2f, 0xb8, - 0x55, 0xb9, 0xda, 0x85, 0x3f, 0x41, 0xbf, 0xe0, - 0x5a, 0x58, 0x80, 0x5f, 0x66, 0x0b, 0xd8, 0x90, - 0x35, 0xd5, 0xc0, 0xa7, 0x33, 0x06, 0x65, 0x69, - 0x45, 0x00, 0x94, 0x56, 0x6d, 0x98, 0x9b, 0x76, - 0x97, 0xfc, 0xb2, 0xc2, 0xb0, 0xfe, 0xdb, 0x20, - 0xe1, 0xeb, 0xd6, 0xe4, 0xdd, 0x47, 0x4a, 0x1d, - 0x42, 0xed, 0x9e, 0x6e, 0x49, 0x3c, 0xcd, 0x43, - 0x27, 0xd2, 0x07, 0xd4, 0xde, 0xc7, 0x67, 0x18, - 0x89, 0xcb, 0x30, 0x1f, 0x8d, 0xc6, 0x8f, 0xaa, - 0xc8, 0x74, 0xdc, 0xc9, 0x5d, 0x5c, 0x31, 0xa4, - 0x70, 0x88, 0x61, 0x2c, 0x9f, 0x0d, 0x2b, 0x87, - 0x50, 0x82, 0x54, 0x64, 0x26, 0x7d, 0x03, 0x40, - 0x34, 0x4b, 0x1c, 0x73, 0xd1, 0xc4, 0xfd, 0x3b, - 0xcc, 0xfb, 0x7f, 0xab, 0xe6, 0x3e, 0x5b, 0xa5, - 0xad, 0x04, 0x23, 0x9c, 0x14, 0x51, 0x22, 0xf0, - 0x29, 0x79, 0x71, 0x7e, 0xff, 0x8c, 0x0e, 0xe2, - 0x0c, 0xef, 0xbc, 0x72, 0x75, 0x6f, 0x37, 0xa1, - 0xec, 0xd3, 0x8e, 0x62, 0x8b, 0x86, 0x10, 0xe8, - 0x08, 0x77, 0x11, 0xbe, 0x92, 0x4f, 0x24, 0xc5, - 0x32, 0x36, 0x9d, 0xcf, 0xf3, 0xa6, 0xbb, 0xac, - 0x5e, 0x6c, 0xa9, 0x13, 0x57, 0x25, 0xb5, 0xe3, - 0xbd, 0xa8, 0x3a, 0x01, 0x05, 0x59, 0x2a, 0x46 -}; - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - -static uint16_t idgen32_g(uint8_t * key, int k, uint16_t w) -{ - uint8_t g1, g2, g3, g4, g5, g6; - unsigned int o = k * 4; - - g1 = (w >> 8) & 0xff; - g2 = w & 0xff; - - g3 = ftable[g2 ^ key[o++ & (IDGEN32_KEYLEN - 1)]] ^ g1; - g4 = ftable[g3 ^ key[o++ & (IDGEN32_KEYLEN - 1)]] ^ g2; - g5 = ftable[g4 ^ key[o++ & (IDGEN32_KEYLEN - 1)]] ^ g3; - g6 = ftable[g5 ^ key[o++ & (IDGEN32_KEYLEN - 1)]] ^ g4; - - return (g5 << 8) | g6; -} - -static uint32_t idgen32_permute(uint8_t key[IDGEN32_KEYLEN], uint32_t in) -{ - unsigned int i, r; - uint16_t wl, wr; - - wl = (in >> 16) & 0x7fff; - wr = in & 0xffff; - - /* Doubled up rounds, with an odd round at the end to swap */ - for (i = r = 0; i < IDGEN32_ROUNDS / 2; ++i) - { - wr ^= (idgen32_g(key, r, wl) ^ r); - r++; - wl ^= (idgen32_g(key, r, wr) ^ r) & 0x7fff; - r++; - } - wr ^= (idgen32_g(key, r, wl) ^ r); - - return (wl << 16) | wr; -} - -static void idgen32_rekey(struct idgen32_ctx *ctx) -{ - srand(time(NULL)); - ctx->id_counter = 0; - ctx->id_hibit ^= 0x80000000; - // ctx->id_offset = arc4random(); - ctx->id_offset = rand(); - // arc4random_buf(ctx->id_key, sizeof(ctx->id_key)); - ctx->id_key[0] = rand(); - ctx->id_key[1] = rand(); - ctx->id_key[2] = rand(); - ctx->id_key[3] = rand(); - ctx->id_key[4] = rand(); - ctx->id_key[5] = rand(); - ctx->id_key[6] = rand(); - ctx->id_key[7] = rand(); - ctx->id_key[8] = rand(); - ctx->id_key[9] = rand(); - ctx->id_key[10] = rand(); - ctx->id_key[11] = rand(); - ctx->id_key[12] = rand(); - ctx->id_key[13] = rand(); - ctx->id_key[14] = rand(); - ctx->id_key[15] = rand(); - ctx->id_key[16] = rand(); - ctx->id_key[17] = rand(); - ctx->id_key[18] = rand(); - ctx->id_key[19] = rand(); - ctx->id_key[20] = rand(); - ctx->id_key[21] = rand(); - ctx->id_key[22] = rand(); - ctx->id_key[23] = rand(); - ctx->id_key[24] = rand(); - ctx->id_key[25] = rand(); - ctx->id_key[26] = rand(); - ctx->id_key[27] = rand(); - ctx->id_key[28] = rand(); - ctx->id_key[29] = rand(); - ctx->id_key[30] = rand(); - ctx->id_key[31] = rand(); - ctx->id_rekey_time = IDGEN32_REKEY_TIME; -} - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void idgen32_init(struct idgen32_ctx *ctx) -{ - srand(time(NULL)); - memset(ctx, 0, sizeof(*ctx)); - ctx->id_hibit = rand() & 0x80000000; - idgen32_rekey(ctx); -} - -uint32_t idgen32(struct idgen32_ctx *ctx) -{ - uint32_t ret; - - /* Avoid emitting a zero ID as they often have special meaning */ - do - { - ret = idgen32_permute(ctx->id_key, ctx->id_offset + ctx->id_counter++); - - /* Rekey a little early to avoid "card counting" attack */ - if (ctx->id_counter > IDGEN32_REKEY_LIMIT || ctx->id_rekey_time > 0) - idgen32_rekey(ctx); - } - while (ret == 0); - - return ret | ctx->id_hibit; -} diff --git a/nuttx/fs/nfs/rpc_subr.c b/nuttx/fs/nfs/rpc_subr.c index 9785a9752..ca8aab18f 100644 --- a/nuttx/fs/nfs/rpc_subr.c +++ b/nuttx/fs/nfs/rpc_subr.c @@ -56,7 +56,6 @@ #include <stdio.h> #include <string.h> -#include "rpc_mbuf.h" #include "rpc_v2.h" #include "rpc.h" #include "xdr_subs.h" @@ -203,7 +202,7 @@ int krpc_portmap(struct sockaddr_in *sin, unsigned int prog, unsigned int vers, sdata->port = 0; sin->sin_port = htons(PMAPPORT); - error = krpc_call(sin, PMAPPROG, PMAPVERS, PMAPPROC_GETPORT, -1); + error = krpc_call(sin, PMAPPROG, PMAPVERS, PMAPPROC_GETPORT, NULL, -1); if (error) { return error; @@ -219,16 +218,17 @@ int krpc_portmap(struct sockaddr_in *sin, unsigned int prog, unsigned int vers, */ int krpc_call(struct sockaddr_in *sa, unsigned int prog, unsigned int vers, - unsigned int func, int retries) + unsigned int func, struct sockaddr **from_p, int retries) { struct socket *so; struct sockaddr_in *sin; - struct sockaddr *addr; struct rpc_call *call; struct rpc_reply *reply; int error, rcvflg, timo, secs; static uint32_t xid = 0; struct timeval *tv; + uint16_t tport; + srand(time(NULL)); /* Validate address family. * Sorry, this is INET specific... @@ -254,16 +254,33 @@ int krpc_call(struct sockaddr_in *sa, unsigned int prog, unsigned int vers, goto out; } + /* Enable broadcast if necessary. */ + + if (from_p) + { + int on = 1; + if ((error = psock_setsockopt(so, SOL_SOCKET, SO_BROADCAST, (const void *) on, sizeof (on)))) + { + goto out; + } + } + /* Bind the local endpoint to a reserved port, * because some NFS servers refuse requests from * non-reserved (non-privileged) ports. */ sin->sin_family = AF_INET; - sin->sin_port = htons(0); sin->sin_addr.s_addr = INADDR_ANY; - - error = psock_bind(so, addr, sizeof(*addr)); + tport = 1024; + + do + { + tport--; + sin->sin_port = htons(tport); + error = psock_bind(so, (struct sockaddr*) sin, sizeof(*sin)); + } + while (error == EADDRINUSE && tport < 1024 / 2); if (error) { @@ -273,14 +290,15 @@ int krpc_call(struct sockaddr_in *sa, unsigned int prog, unsigned int vers, /* Setup socket address for the server. */ - memmove((char*)sin,(char*)sa, sizeof(*sa)); + memmove((void*)sin,(void*)sa, sizeof(*sa)); /* Prepend RPC message header. */ - memset((char*) call, 0, sizeof(*call)); + memset((void*) call, 0, sizeof(*call)); /* rpc_call part */ + //xid++ xid = krpc_get_xid(); call->rp_xid = txdr_unsigned(xid); @@ -301,7 +319,6 @@ int krpc_call(struct sockaddr_in *sa, unsigned int prog, unsigned int vers, call->rpc_verf.authtype = 0; call->rpc_verf.authlen = 0; - /* Send it, repeatedly, until a reply is received, * but delay each re-send by an increasing amount. * If the delay hits the maximum, start complaining. @@ -318,7 +335,6 @@ int krpc_call(struct sockaddr_in *sa, unsigned int prog, unsigned int vers, goto out; } - /* Determine new timeout. */ if (timo < MAX_RESEND_DELAY) @@ -351,7 +367,6 @@ int krpc_call(struct sockaddr_in *sa, unsigned int prog, unsigned int vers, goto out; } - /* Is it the right reply? */ if (reply->rp_direction != txdr_unsigned(RPC_REPLY)) @@ -394,86 +409,36 @@ out: /* eXternal Data Representation routines. (but with non-standard args...) */ -struct mbuf *xdr_string_encode(char *str, int len) +void xdr_string_encode(char *str, int len) { - struct mbuf *m; struct xdr_string *xs; - int dlen; /* padded string length */ - int mlen; /* message length */ - - dlen = (len + 3) & ~3; - mlen = dlen + 4; - - if (mlen > MCLBYTES) /* If too big, we just can't do it. */ - { - return (NULL); - } - - m = m_get(M_WAIT, MT_DATA); - if (mlen > MLEN) - { - MCLGET(m, M_WAIT); - if ((m->m_flags & M_EXT) == 0) - { - (void)m_free(m); /* There can be only one. */ - return (NULL); - } - } - - xs = mtod(m, struct xdr_string *); - m->m_len = mlen; + xs->len = txdr_unsigned(len); strncpy(xs->data, str, len); - return (m); } -struct mbuf *xdr_string_decode(struct mbuf *m, char *str, int *len_p) +void xdr_string_decode(char *str, int *len_p) { struct xdr_string *xs; - int mlen; /* message length */ int slen; /* string length */ - if (m->m_len < 4) - { - m = m_pullup(m, 4); - if (m == NULL) - return (NULL); - } - - xs = mtod(m, struct xdr_string *); slen = fxdr_unsigned(uint32_t, xs->len); - mlen = 4 + ((slen + 3) & ~3); if (slen > *len_p) { slen = *len_p; } - if (slen > m->m_pkthdr.len) - { - m_freem(m); - return (NULL); - } - - m_copydata(m, 4, slen, str); - m_adj(m, mlen); - str[slen] = '\0'; *len_p = slen; - - return (m); } -struct mbuf *xdr_inaddr_encode(struct in_addr *ia) +void xdr_inaddr_encode(struct in_addr *ia) { - struct mbuf *m; struct xdr_inaddr *xi; uint8_t *cp; uint32_t *ip; - m = m_get(M_WAIT, MT_DATA); - xi = mtod(m, struct xdr_inaddr *); - m->m_len = sizeof(*xi); xi->atype = txdr_unsigned(1); ip = xi->addr; cp = (uint8_t *) & ia->s_addr; @@ -481,38 +446,23 @@ struct mbuf *xdr_inaddr_encode(struct in_addr *ia) *ip++ = txdr_unsigned(*cp++); *ip++ = txdr_unsigned(*cp++); *ip++ = txdr_unsigned(*cp++); - - return (m); } -struct mbuf *xdr_inaddr_decode(struct mbuf *m, struct in_addr *ia) +void xdr_inaddr_decode(struct in_addr *ia) { struct xdr_inaddr *xi; uint8_t *cp; uint32_t *ip; - if (m->m_len < sizeof(*xi)) - { - m = m_pullup(m, sizeof(*xi)); - if (m == NULL) - return (NULL); - } - - xi = mtod(m, struct xdr_inaddr *); - if (xi->atype != txdr_unsigned(1)) - { - ia->s_addr = INADDR_ANY; - goto out; - } - ip = xi->addr; cp = (uint8_t *) & ia->s_addr; *cp++ = fxdr_unsigned(uint8_t, *ip++); *cp++ = fxdr_unsigned(uint8_t, *ip++); *cp++ = fxdr_unsigned(uint8_t, *ip++); *cp++ = fxdr_unsigned(uint8_t, *ip++); - -out: - m_adj(m, sizeof(*xi)); - return (m); + + if (xi->atype != txdr_unsigned(1)) + { + ia->s_addr = INADDR_ANY; + } } |