Changeset 87194f9 in rtems
- Timestamp:
- Jun 6, 2012, 12:06:48 PM (9 years ago)
- 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. - Location:
- cpukit
- Files:
-
- 1 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/libnetworking/Makefile.am
r0604477 r87194f9 5 5 6 6 EXTRA_DIST = README 7 EXTRA_DIST += rtems/bootp.h 7 8 8 9 # poll is not supported -
cpukit/libnetworking/nfs/bootp_subr.c
r0604477 r87194f9 73 73 #include <inttypes.h> 74 74 75 #include "rtems/bootp.h" 76 75 77 #define BOOTP_MIN_LEN 300 /* Minimum size of bootp udp packet */ 76 78 … … 137 139 #endif 138 140 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 int147 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 153 141 #ifdef BOOTP_DEBUG 154 142 void … … 270 258 * - copy string from src to dest 271 259 */ 272 staticvoid *bootp_strdup_realloc(char *dst,const char *src)260 void *bootp_strdup_realloc(char *dst,const char *src) 273 261 { 274 262 size_t len; -
cpukit/libnetworking/rtems/rtems_bootp.c
r0604477 r87194f9 8 8 #include <rtems/rtems_bsdnet.h> 9 9 #include <rtems/rtems_bsdnet_internal.h> 10 11 #include "rtems/bootp.h" 10 12 11 13 /* -
cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
r0604477 r87194f9 174 174 void ipintr (void); 175 175 void arpintr (void); 176 bool bootpc_init(bool, bool);177 176 int socket (int, int, int); 178 177 int ioctl (int, ioctl_command_t, ...); -
cpukit/libnetworking/rtems/rtems_dhcp.c
r0604477 r87194f9 100 100 101 101 #include "rtems/dhcp.h" 102 #include "rtems/bootp.h" 102 103 103 104 #ifndef EALEN … … 166 167 unsigned char vend[312]; 167 168 }; 168 169 /*170 * External Declarations for Functions found in171 * 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);187 169 188 170 /* … … 756 738 * Send the Request. 757 739 */ 758 error = bootpc_call ( &call,&dhcp_req, procp);740 error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&dhcp_req, procp); 759 741 if (error) { 760 742 rtems_bsdnet_semaphore_release (); … … 961 943 * Send the Discover. 962 944 */ 963 error = bootpc_call ( &call,&reply, procp);945 error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&reply, procp); 964 946 if (error) { 965 947 printf ("BOOTP call failed -- %s\n", strerror(error)); … … 990 972 dhcp_request_req (&call, &reply, sdl, true); 991 973 992 error = bootpc_call ( &call,&reply, procp);974 error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&reply, procp); 993 975 if (error) { 994 976 printf ("BOOTP call failed -- %s\n", strerror(error)); -
cpukit/librpc/include/rpc/auth.h
r0604477 r87194f9 68 68 */ 69 69 AUTH_INVALIDRESP=6, /* bogus response verifier */ 70 AUTH_FAILED=7 /* some unknown reason */ 70 AUTH_FAILED=7, /* some unknown reason */ 71 _AUTH_STAT = 0xffffffff 71 72 }; 72 73 -
cpukit/librpc/include/rpc/clnt_stat.h
r0604477 r87194f9 74 74 RPC_CANTCONNECT = 26, /* couldn't make connection (cots) */ 75 75 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 77 78 }; 78 79 -
cpukit/librpc/include/rpc/rpc_msg.h
r0604477 r87194f9 59 59 enum msg_type { 60 60 CALL=0, 61 REPLY=1 61 REPLY=1, 62 _MSG_TYPE = 0xffffffff 62 63 }; 63 64 64 65 enum reply_stat { 65 66 MSG_ACCEPTED=0, 66 MSG_DENIED=1 67 MSG_DENIED=1, 68 _REPLY_STAT = 0xffffffff 67 69 }; 68 70 … … 73 75 PROC_UNAVAIL=3, 74 76 GARBAGE_ARGS=4, 75 SYSTEM_ERR=5 77 SYSTEM_ERR=5, 78 _ACCEPT_STAT = 0xffffffff 76 79 }; 77 80 78 81 enum reject_stat { 79 82 RPC_MISMATCH=0, 80 AUTH_ERROR=1 83 AUTH_ERROR=1, 84 _REJECT_STAT = 0xffffffff 81 85 }; 82 86 -
cpukit/librpc/include/rpc/svc.h
r0604477 r87194f9 73 73 XPRT_DIED, 74 74 XPRT_MOREREQS, 75 XPRT_IDLE 75 XPRT_IDLE, 76 _XPRT_STAT = 0xffffffff 76 77 }; 77 78 -
cpukit/librpc/include/rpcsvc/nis_db.h
r0604477 r87194f9 70 70 DB_MEMORY_LIMIT = 6, 71 71 DB_STORAGE_LIMIT = 7, 72 DB_INTERNAL_ERROR = 8 72 DB_INTERNAL_ERROR = 8, 73 _DB_STATUS = 0xffffffff 73 74 }; 74 75 typedef enum db_status db_status; … … 81 82 DB_NEXT = 4, 82 83 DB_ALL = 5, 83 DB_RESET_NEXT = 6 84 DB_RESET_NEXT = 6, 85 _DB_ACTION = 0xffffffff 84 86 }; 85 87 typedef enum db_action db_action; -
cpukit/librpc/include/rpcsvc/yp_prot.h
r0604477 r87194f9 234 234 enum ypbind_resptype { 235 235 YPBIND_SUCC_VAL = 1, 236 YPBIND_FAIL_VAL = 2 236 YPBIND_FAIL_VAL = 2, 237 _YPBIND_RESPTYPE = 0xffffffff 237 238 }; 238 239 -
cpukit/librpc/src/xdr/xdr.c
r0604477 r87194f9 459 459 { 460 460 #ifndef lint 461 enum sizecheck { SIZEVAL }; /* used to find the size of an enum */462 463 461 /* 464 462 * enums are treated as ints 465 463 */ 466 if (sizeof (enum sizecheck) == sizeof (long)) {464 if (sizeof (enum_t) == sizeof (long)) { 467 465 return (xdr_long(xdrs, (long *)ep)); 468 } else if (sizeof (enum sizecheck) == sizeof (int)) {466 } else if (sizeof (enum_t) == sizeof (int)) { 469 467 return (xdr_int(xdrs, (int *)ep)); 470 } else if (sizeof (enum sizecheck) == sizeof (short)) {468 } else if (sizeof (enum_t) == sizeof (short)) { 471 469 return (xdr_short(xdrs, (short *)ep)); 472 470 } else {
Note: See TracChangeset
for help on using the changeset viewer.