Changeset 87194f9 in rtems


Ignore:
Timestamp:
Jun 6, 2012, 12:06:48 PM (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
65d8263
Parents:
0604477 (diff), 8250503 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

Location:
cpukit
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • cpukit/libnetworking/Makefile.am

    r0604477 r87194f9  
    55
    66EXTRA_DIST = README
     7EXTRA_DIST += rtems/bootp.h
    78
    89# poll is not supported

  • cpukit/libnetworking/nfs/bootp_subr.c

    r0604477 r87194f9  
    7373#include <inttypes.h>
    7474
     75#include "rtems/bootp.h"
     76
    7577#define BOOTP_MIN_LEN           300     /* Minimum size of bootp udp packet */
    7678
    … …  
    137139#endif
    138140
    139 int  bootpc_call(struct bootp_packet *call,
    140                  struct bootp_packet *reply,
    141                  struct proc *procp);
    142 
    143 int bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
    144                         struct proc *procp);
    145 
    146 int
    147 bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
    148                         struct sockaddr_in *myaddr,
    149                         struct sockaddr_in *netmask,
    150                         struct sockaddr_in *gw,
    151                         struct proc *procp);
    152 
    153141#ifdef BOOTP_DEBUG
    154142void
    … …  
    270258 * - copy string from src to dest
    271259 */
    272 static void *bootp_strdup_realloc(char *dst,const char *src)
     260void *bootp_strdup_realloc(char *dst,const char *src)
    273261{
    274262  size_t len;

  • cpukit/libnetworking/rtems/rtems_bootp.c

    r0604477 r87194f9  
    88#include <rtems/rtems_bsdnet.h>
    99#include <rtems/rtems_bsdnet_internal.h>
     10
     11#include "rtems/bootp.h"
    1012
    1113/*

  • cpukit/libnetworking/rtems/rtems_bsdnet_internal.h

    r0604477 r87194f9  
    174174void ipintr (void);
    175175void arpintr (void);
    176 bool bootpc_init(bool, bool);
    177176int socket (int, int, int);
    178177int ioctl (int, ioctl_command_t, ...);

  • cpukit/libnetworking/rtems/rtems_dhcp.c

    r0604477 r87194f9  
    100100
    101101#include "rtems/dhcp.h"
     102#include "rtems/bootp.h"
    102103
    103104#ifndef EALEN
    … …  
    166167  unsigned char  vend[312];
    167168};
    168 
    169 /*
    170  * External Declarations for Functions found in
    171  * rtems/c/src/libnetworking/nfs/
    172  */
    173 extern int bootpc_call (struct dhcp_packet *call,
    174                         struct dhcp_packet *reply,
    175                         struct proc *procp);
    176 extern int bootpc_fakeup_interface (struct ifreq *ireq,
    177                                     struct socket *so,
    178                                     struct proc *procp);
    179 extern int bootpc_adjust_interface (struct ifreq *ireq,
    180                                     struct socket *so,
    181                                     struct sockaddr_in *myaddr,
    182                                     struct sockaddr_in *netmask,
    183                                     struct sockaddr_in *gw,
    184                                     struct proc *procp);
    185 extern void *bootp_strdup_realloc (char *dst,
    186                                    const char *src);
    187169
    188170/*
    … …  
    756738       * Send the Request.
    757739       */
    758       error = bootpc_call (&call, &dhcp_req, procp);
     740      error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&dhcp_req, procp);
    759741      if (error) {
    760742        rtems_bsdnet_semaphore_release ();
    … …  
    961943   * Send the Discover.
    962944   */
    963   error = bootpc_call (&call, &reply, procp);
     945  error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&reply, procp);
    964946  if (error) {
    965947    printf ("BOOTP call failed -- %s\n", strerror(error));
    … …  
    990972  dhcp_request_req (&call, &reply, sdl, true);
    991973
    992   error = bootpc_call (&call, &reply, procp);
     974  error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&reply, procp);
    993975  if (error) {
    994976    printf ("BOOTP call failed -- %s\n", strerror(error));

  • cpukit/librpc/include/rpc/auth.h

    r0604477 r87194f9  
    6868        */
    6969        AUTH_INVALIDRESP=6,             /* bogus response verifier */
    70         AUTH_FAILED=7                   /* some unknown reason */
     70        AUTH_FAILED=7,                  /* some unknown reason */
     71        _AUTH_STAT = 0xffffffff
    7172};
    7273

  • cpukit/librpc/include/rpc/clnt_stat.h

    r0604477 r87194f9  
    7474        RPC_CANTCONNECT = 26,           /* couldn't make connection (cots) */
    7575        RPC_XPRTFAILED = 27,            /* received discon from remote (cots) */
    76         RPC_CANTCREATESTREAM = 28       /* can't push rpc module (cots) */
     76        RPC_CANTCREATESTREAM = 28,      /* can't push rpc module (cots) */
     77        _CLNT_STAT = 0xffffffff
    7778};
    7879

  • cpukit/librpc/include/rpc/rpc_msg.h

    r0604477 r87194f9  
    5959enum msg_type {
    6060        CALL=0,
    61         REPLY=1
     61        REPLY=1,
     62        _MSG_TYPE = 0xffffffff
    6263};
    6364
    6465enum reply_stat {
    6566        MSG_ACCEPTED=0,
    66         MSG_DENIED=1
     67        MSG_DENIED=1,
     68        _REPLY_STAT = 0xffffffff
    6769};
    6870
    … …  
    7375        PROC_UNAVAIL=3,
    7476        GARBAGE_ARGS=4,
    75         SYSTEM_ERR=5
     77        SYSTEM_ERR=5,
     78        _ACCEPT_STAT = 0xffffffff
    7679};
    7780
    7881enum reject_stat {
    7982        RPC_MISMATCH=0,
    80         AUTH_ERROR=1
     83        AUTH_ERROR=1,
     84        _REJECT_STAT = 0xffffffff
    8185};
    8286

  • cpukit/librpc/include/rpc/svc.h

    r0604477 r87194f9  
    7373        XPRT_DIED,
    7474        XPRT_MOREREQS,
    75         XPRT_IDLE
     75        XPRT_IDLE,
     76        _XPRT_STAT = 0xffffffff
    7677};
    7778

  • cpukit/librpc/include/rpcsvc/nis_db.h

    r0604477 r87194f9  
    7070        DB_MEMORY_LIMIT = 6,
    7171        DB_STORAGE_LIMIT = 7,
    72         DB_INTERNAL_ERROR = 8
     72        DB_INTERNAL_ERROR = 8,
     73        _DB_STATUS = 0xffffffff
    7374};
    7475typedef enum db_status db_status;
    … …  
    8182        DB_NEXT = 4,
    8283        DB_ALL = 5,
    83         DB_RESET_NEXT = 6
     84        DB_RESET_NEXT = 6,
     85        _DB_ACTION = 0xffffffff
    8486};
    8587typedef enum db_action db_action;

  • cpukit/librpc/include/rpcsvc/yp_prot.h

    r0604477 r87194f9  
    234234enum ypbind_resptype {
    235235        YPBIND_SUCC_VAL = 1,
    236         YPBIND_FAIL_VAL = 2
     236        YPBIND_FAIL_VAL = 2,
     237        _YPBIND_RESPTYPE = 0xffffffff
    237238};
    238239

  • cpukit/librpc/src/xdr/xdr.c

    r0604477 r87194f9  
    459459{
    460460#ifndef lint
    461         enum sizecheck { SIZEVAL };     /* used to find the size of an enum */
    462 
    463461        /*
    464462         * enums are treated as ints
    465463         */
    466         if (sizeof (enum sizecheck) == sizeof (long)) {
     464        if (sizeof (enum_t) == sizeof (long)) {
    467465                return (xdr_long(xdrs, (long *)ep));
    468         } else if (sizeof (enum sizecheck) == sizeof (int)) {
     466        } else if (sizeof (enum_t) == sizeof (int)) {
    469467                return (xdr_int(xdrs, (int *)ep));
    470         } else if (sizeof (enum sizecheck) == sizeof (short)) {
     468        } else if (sizeof (enum_t) == sizeof (short)) {
    471469                return (xdr_short(xdrs, (short *)ep));
    472470        } else {
Note: See TracChangeset for help on using the changeset viewer.