--- otp_src_R12B-0/erts/emulator/drivers/common/inet_drv.c 2007-11-30 15:46:26.000000000 -0600 +++ otp_src_R12B-0-modified/erts/emulator/drivers/common/inet_drv.c 2008-01-18 17:58:51.000000000 -0600 @@ -545,7 +545,7 @@ #define SCTP_OPT_MAXSEG 107 #define SCTP_OPT_SET_PEER_PRIMARY_ADDR 108 #define SCTP_OPT_PRIMARY_ADDR 109 -#define SCTP_OPT_ADAPTION_LAYER 110 +#define SCTP_OPT_ADAPTATION_LAYER 110 #define SCTP_OPT_PEER_ADDR_PARAMS 111 #define SCTP_OPT_DEFAULT_SEND_PARAM 112 #define SCTP_OPT_EVENTS 113 @@ -2711,7 +2711,7 @@ am_sctp_autoclose, am_sctp_nodelay, am_sctp_disable_fragments, am_sctp_i_want_mapped_v4_addr, am_sctp_maxseg, am_sctp_set_peer_primary_addr, - am_sctp_primary_addr, am_sctp_adaption_layer, + am_sctp_primary_addr, am_sctp_adaptation_layer, am_sctp_peer_addr_params, am_sctp_default_send_param, am_sctp_events, am_sctp_delayed_ack_time, am_sctp_status, am_sctp_get_peer_addr_info, @@ -2720,7 +2720,7 @@ am_sctp_sndrcvinfo, am_sctp_assoc_change, am_sctp_paddr_change, am_sctp_remote_error, am_sctp_send_failed, am_sctp_shutdown_event, - am_sctp_adaption_event, am_sctp_pdapi_event, + am_sctp_adaptation_event, am_sctp_pdapi_event, am_sctp_assocparams, am_sctp_prim, am_sctp_setpeerprim, am_sctp_setadaption, am_sctp_paddrparams, am_sctp_event_subscribe, @@ -3097,18 +3097,18 @@ break; } - case SCTP_ADAPTION_INDICATION: - { /* {sctp_adaption_event, + case SCTP_ADAPTATION_INDICATION: + { /* {sctp_adaptation_event, Indication : Atom(), AssocID : Int() } */ - struct sctp_adaption_event * sptr = &(nptr->sn_adaption_event); - ASSERT (sptr->sai_length == sizeof(struct sctp_adaption_event) && + struct sctp_adaptation_event * sptr = &(nptr->sn_adaptation_event); + ASSERT (sptr->sai_length == sizeof(struct sctp_adaptation_event) && sptr->sai_length <= sz); /* No buffer overrun */ - i = LOAD_ATOM (spec, i, am_sctp_adaption_event); - i = LOAD_INT (spec, i, sock_ntohl(sptr->sai_adaption_ind)); + i = LOAD_ATOM (spec, i, am_sctp_adaptation_event); + i = LOAD_INT (spec, i, sock_ntohl(sptr->sai_adaptation_ind)); i = LOAD_INT (spec, i, sptr->sai_assoc_id); i = LOAD_TUPLE (spec, i, 3); break; @@ -3766,7 +3766,7 @@ INIT_ATOM(sctp_maxseg); INIT_ATOM(sctp_set_peer_primary_addr); INIT_ATOM(sctp_primary_addr); - INIT_ATOM(sctp_adaption_layer); + INIT_ATOM(sctp_adaptation_layer); INIT_ATOM(sctp_peer_addr_params); INIT_ATOM(sctp_default_send_param); INIT_ATOM(sctp_events); @@ -3781,7 +3781,7 @@ INIT_ATOM(sctp_remote_error); INIT_ATOM(sctp_send_failed); INIT_ATOM(sctp_shutdown_event); - INIT_ATOM(sctp_adaption_event); + INIT_ATOM(sctp_adaptation_event); INIT_ATOM(sctp_pdapi_event); INIT_ATOM(sctp_assocparams); INIT_ATOM(sctp_prim); @@ -5320,7 +5320,7 @@ struct sctp_initmsg im; struct linger lin; struct sctp_setpeerprim prim; - struct sctp_setadaption ad; + struct sctp_setadaptation ad; struct sctp_paddrparams pap; struct sctp_sndrcvinfo sri; struct sctp_event_subscribe es; @@ -5575,13 +5575,13 @@ arg_sz = sizeof ( arg.prim); break; } - case SCTP_OPT_ADAPTION_LAYER: + case SCTP_OPT_ADAPTATION_LAYER: { /* XXX: do we need to convert the Ind into network byte order??? */ - arg.ad.ssb_adaption_ind = sock_htonl (get_int32(curr)); curr += 4; + arg.ad.ssb_adaptation_ind = sock_htonl (get_int32(curr)); curr += 4; proto = IPPROTO_SCTP; - type = SCTP_ADAPTION_LAYER; + type = SCTP_ADAPTATION_LAYER; arg_ptr = (char*) (&arg.ad); arg_sz = sizeof ( arg.ad); break; @@ -5685,7 +5685,7 @@ arg.es.sctp_peer_error_event = get_int8(curr); curr++; arg.es.sctp_shutdown_event = get_int8(curr); curr++; arg.es.sctp_partial_delivery_event = get_int8(curr); curr++; - arg.es.sctp_adaption_layer_event = get_int8(curr); curr++; + arg.es.sctp_adaptation_layer_event = get_int8(curr); curr++; proto = IPPROTO_SCTP; type = SCTP_EVENTS; @@ -6443,19 +6443,19 @@ i = LOAD_TUPLE (spec, i, 2); break; } - case SCTP_OPT_ADAPTION_LAYER: + case SCTP_OPT_ADAPTATION_LAYER: { - struct sctp_setadaption ad; + struct sctp_setadaptation ad; unsigned int sz = sizeof (ad); - if (sock_getopt(desc->s, IPPROTO_SCTP, SCTP_ADAPTION_LAYER, + if (sock_getopt(desc->s, IPPROTO_SCTP, SCTP_ADAPTATION_LAYER, &ad, &sz) < 0) continue; /* Fill in the response: */ PLACE_FOR(spec, i, 2*LOAD_ATOM_CNT + LOAD_INT_CNT + 2*LOAD_TUPLE_CNT); - i = LOAD_ATOM (spec, i, am_sctp_adaption_layer); + i = LOAD_ATOM (spec, i, am_sctp_adaptation_layer); i = LOAD_ATOM (spec, i, am_sctp_setadaption); - i = LOAD_INT (spec, i, ad.ssb_adaption_ind); + i = LOAD_INT (spec, i, ad.ssb_adaptation_ind); i = LOAD_TUPLE (spec, i, 2); i = LOAD_TUPLE (spec, i, 2); break; @@ -6583,7 +6583,7 @@ i = LOAD_BOOL (spec, i, evs.sctp_peer_error_event); i = LOAD_BOOL (spec, i, evs.sctp_shutdown_event); i = LOAD_BOOL (spec, i, evs.sctp_partial_delivery_event); - i = LOAD_BOOL (spec, i, evs.sctp_adaption_layer_event); + i = LOAD_BOOL (spec, i, evs.sctp_adaptation_layer_event); /* NB: sctp_authentication_event is not yet supported in Linux */ i = LOAD_TUPLE (spec, i, 9); i = LOAD_TUPLE (spec, i, 2);