/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1995-2007 Apple Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
*
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* Please see the License for the specific language governing rights and
* limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
- * Copyright (c) 1995 Apple Computer, Inc.
- *
* Change Log:
* Created February 20, 1995 by Tuyen Nguyen
* Modified for MP, 1996 by Tuyen Nguyen
#include <sys/mbuf.h>
#include <sys/ioctl.h>
#include <sys/malloc.h>
+#include <kern/locks.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <net/if.h>
-#include <netat/appletalk.h>
#include <netat/sysglue.h>
+#include <netat/appletalk.h>
#include <netat/at_pcb.h>
#include <netat/atp.h>
#include <netat/ddp.h>
#include <netat/at_var.h>
#include <netat/debug.h>
-static int loop_cnt;
-#define CHK_LOOP(str) { \
- if (loop_cnt++ > 100) { \
- kprintf("%s", str); \
- break; \
- } \
-}
#define atpBDSsize (sizeof(struct atpBDS)*ATP_TRESP_MAX)
#define aspCMDsize (atpBDSsize+sizeof(struct atp_set_default)+TOTAL_ATP_HDR_SIZE)
&& ((scb->rem_addr.net != addr.net) \
|| (scb->rem_addr.node != addr.node)) )
-int ASPputmsg();
-int ASPgetmsg();
-void asp_init();
-void asp_ack_reply();
-void asp_nak_reply();
-void asp_clock();
-void asp_clock_funnel();
-int asp_open();
-int asp_close();
-int asp_wput();
-void atp_retry_req();
-StaticProc asp_scb_t *asp_find_scb();
-StaticProc asp_scb_t *asp_scb_alloc();
-
-StaticProc void asp_putnext();
-StaticProc void asp_iocack();
-StaticProc void asp_iocnak();
-StaticProc void asp_dequeue_scb();
-StaticProc void asp_scb_free();
-StaticProc void asp_timout();
-StaticProc void asp_untimout();
-StaticProc void asp_hangup();
-StaticProc void asp_send_tickle();
-StaticProc void asp_send_tickle_funnel();
-StaticProc void asp_accept();
-StaticProc int asp_send_req();
+StaticProc asp_scb_t *asp_find_scb(unsigned char, at_inet_t *);
+StaticProc asp_scb_t *asp_scb_alloc(void);
+
+StaticProc void asp_putnext(gref_t *, gbuf_t *);
+StaticProc void asp_iocack(gref_t *, gbuf_t *);
+StaticProc void asp_iocnak(gref_t *, gbuf_t *, int);
+StaticProc void asp_dequeue_scb(asp_scb_t *);
+StaticProc void asp_scb_free(asp_scb_t *);
+StaticProc void asp_timout(asp_tmo_func, asp_scb_t *, int);
+StaticProc void asp_untimout(asp_tmo_func, asp_scb_t *);
+StaticProc void asp_hangup(asp_scb_t *);
+StaticProc void asp_send_tickle(asp_scb_t *);
+StaticProc void asp_send_tickle_locked(void *);
+StaticProc void asp_accept(asp_scb_t *scb, asp_scb_t *sess_scb, gbuf_t *m);
+StaticProc int asp_send_req(gref_t *, gbuf_t *, at_inet_t *, at_retry_t *, asp_word_t *,
+ unsigned char , unsigned char, unsigned char);
extern at_ifaddr_t *ifID_home;
extern int atp_pidM[];
extern gref_t *atp_inputQ[];
+extern lck_mtx_t *atalk_mutex;
gbuf_t *scb_resource_m = 0;
unsigned char asp_inpC[256];
asp_scb_t *asp_scbQ[256];
asp_scb_t *scb_used_list;
static asp_scb_t *scb_tmo_list;
asp_scb_t *scb_free_list;
-atlock_t aspall_lock, asptmo_lock;
+
+int asp_readable(gref_t *);
int
asp_readable(gref)
int asp_open(gref)
gref_t *gref;
{
- int s;
asp_scb_t *scb;
/*
scb->gref = gref;
scb->session_timer = DEF_SESS_TMO;
scb->cmd_retry = asp_def_retry;
- ATDISABLE(s, aspall_lock);
if ((scb->next_scb = scb_used_list) != 0)
scb->next_scb->prev_scb = scb;
scb_used_list = scb;
- ATENABLE(s, aspall_lock);
/*
* return success
asp_close(gref)
gref_t *gref;
{
- int s;
unsigned char sock_num;
asp_scb_t *scb, *new_scb;
gbuf_t *m;
* send the CloseSess response to peer
*/
if (gbuf_type(scb->sess_ioc) != MSG_PROTO) {
- ATDISABLE(s, scb->lock);
m = scb->sess_ioc;
scb->sess_ioc = gbuf_next(m);
- ATENABLE(s, scb->lock);
atp_send_rsp(scb->gref, m, TRUE);
}
}
if (scb->atp_state) {
sock_num = scb->loc_addr.socket;
- ATDISABLE(s, aspall_lock);
if ((scb->dflag != 1) && scb->stat_msg) {
untimeout(atp_retry_req, scb->stat_msg);
gbuf_freem(scb->stat_msg);
if (asp_scbQ[sock_num]->next_scb == 0) {
asp_scbQ[sock_num] = 0;
asp_inpC[sock_num] = 0;
- ATENABLE(s, aspall_lock);
dPrintf(D_M_ASP, D_L_INFO,
(" : atp_close(), loc=%d\n", scb->loc_addr.socket));
atp_close(gref, 0);
scb->next_scb->prev_scb = scb->prev_scb;
}
scb->next_scb = 0;
- ATENABLE(s, aspall_lock);
}
} else
asp_dequeue_scb(scb);
/*
* free all allocated blocks if any
*/
- ATDISABLE(s, scb->lock);
if (scb->stat_msg) {
gbuf_freem(scb->stat_msg);
scb->stat_msg = 0;
}
scb->rem_addr.node = 0;
- ATENABLE(s, scb->lock);
/*
* stop all timers
*/
scb->tmo_cnt = 0;
asp_untimout(asp_hangup, scb);
- untimeout(asp_send_tickle_funnel, (void *)scb); /* added for 2225395 */
+ untimeout(asp_send_tickle_locked, (void *)scb); /* added for 2225395 */
/*
* free the asp session control block
return 0;
} /* asp_close */
-static char *aspStateStr(state)
+#ifdef DEBUG
+
+static const char *aspStateStr(int);
+
+static const char *aspStateStr(state)
int state;
{
return ((state==ASPSTATE_Close)? "Close":
"unknown");
}
-static char *aspCmdStr(aspCmd)
+static const char *aspCmdStr(int);
+
+static const char *aspCmdStr(aspCmd)
int aspCmd;
{
return ((aspCmd==ASPFUNC_CloseSess)? "CloseSess":
(aspCmd==ASPFUNC_CmdReply)? "CmdReply": "unknown");
}
-static char *aspIOCStr(aspIOC)
+static const char *aspIOCStr(int);
+
+static const char *aspIOCStr(aspIOC)
int aspIOC;
{
return (
"unknown"
);
}
+#endif /* DEBUG */
#ifdef AT_MBUF_TRACE
dPrintf(D_M_ASP, D_L_TRACE,
(" %s: %s\n", str, mbuf_totals()));
}
-#endif AT_MBUF_TRACE
+#endif /* AT_MBUF_TRACE */
/*
* the write routine
gref_t *gref;
gbuf_t *m;
{
- int s, err;
+ int err;
unsigned char sockSav, sock_num;
gbuf_t *mioc, *mdata;
ioc_t *iocbp;
case ASPIOC_GetLocEntity:
if ((gbuf_cont(mioc) == 0) || (scb->atp_state == 0)) {
- asp_iocnak(gref, mioc, EPROTO);
+ asp_iocnak(gref, mioc, EPROTOTYPE);
return 0;
}
*(at_inet_t *)gbuf_rptr(gbuf_cont(mioc)) = scb->loc_addr;
case ASPIOC_GetRemEntity:
if ((gbuf_cont(mioc) == 0) || (scb->atp_state == 0)) {
- asp_iocnak(gref, mioc, EPROTO);
+ asp_iocnak(gref, mioc, EPROTOTYPE);
return 0;
}
*(at_inet_t *)gbuf_rptr(gbuf_cont(mioc)) = scb->rem_addr;
case ASPIOC_GetSession:
if ((mdata = gbuf_cont(mioc)) == 0) {
- asp_iocnak(gref, mioc, EPROTO);
+ asp_iocnak(gref, mioc, EPROTOTYPE);
return 0;
}
addr = (at_inet_t *)gbuf_rptr(mdata);
server_scb = asp_scbQ[addr->socket];
/*### LD 10/28/97: changed to make sure we're not accessing a null server_scb */
if (server_scb == 0) {
- asp_iocnak(gref, mioc, EPROTO);
+ asp_iocnak(gref, mioc, EPROTOTYPE);
return 0;
}
if (server_scb->sess_ioc == 0) {
- asp_iocnak(gref, mioc, EPROTO);
+ asp_iocnak(gref, mioc, EPROTOTYPE);
return 0;
}
if ((sock_num = (at_socket)atp_bind(gref, 0, &sockSav)) == 0) {
atp_close(gref, 0);
asp_dequeue_scb(scb);
- ATDISABLE(s, aspall_lock);
sock_num = sockSav;
scb->loc_addr.socket = sock_num;
for (curr_scb = asp_scbQ[sock_num];
scb->prev_scb = curr_scb;
curr_scb->next_scb = scb;
scb->atp_state = curr_scb->atp_state;
- ATENABLE(s, aspall_lock);
} else {
asp_dequeue_scb(scb);
- ATDISABLE(s, aspall_lock);
scb->loc_addr.socket = sock_num;
asp_scbQ[sock_num] = scb;
scb->atp_state->dflag = scb->dflag;
- ATENABLE(s, aspall_lock);
}
gref->info = (void *)scb;
asp_inpC[sock_num]++;
scb->session_timer = open_cmd->SessionTimer;
aw.func = ASPFUNC_OpenSess;
aw.param1 = scb->loc_addr.socket;
- aw.param2 = ASP_Version;
+ aw.param2 = htons(ASP_Version);
scb->ioc_wait = (unsigned char)(iocbp->ioc_cmd & 0xff);
iocbp->ioc_cmd = AT_ATP_ISSUE_REQUEST_DEF;
asp_send_req(gref, mioc, &open_cmd->SLSEntityIdentifier,
{
struct atp_state *atp = (struct atp_state *)gref->info;
if (atp->dflag)
- atp = atp->atp_msgq;
+ atp = (struct atp_state *)atp->atp_msgq;
if (gbuf_cont(mioc) == 0) {
asp_iocnak(gref, mioc, EINVAL);
}
/*
- * send tickle routine - funnelled version
+ * send tickle routine - locked version
*/
StaticProc void
-asp_send_tickle_funnel(scb)
- asp_scb_t *scb;
+asp_send_tickle_locked(scb)
+ void *scb;
{
- thread_funnel_set(network_flock, TRUE);
- asp_send_tickle(scb);
- thread_funnel_set(network_flock, FALSE);
+ atalk_lock();
+ asp_send_tickle((asp_scb_t *)scb);
+ atalk_unlock();
}
dPrintf(D_M_ASP, D_L_WARNING,
("asp_send_tickle: ENOBUFS 0, loc=%d, rem=%d\n",
scb->loc_addr.socket,scb->rem_addr.socket));
- timeout(asp_send_tickle_funnel, (void *)scb, 10);
+ timeout(asp_send_tickle_locked, (void *)scb, 10);
return;
}
gbuf_wset(mioc,sizeof(ioc_t));
("asp_send_tickle: ENOBUFS 1, loc=%d, rem=%d\n",
scb->loc_addr.socket,scb->rem_addr.socket));
- timeout(asp_send_tickle_funnel, (void *)scb, 10);
+ timeout(asp_send_tickle_locked, (void *)scb, 10);
return;
}
}
asp_scb_t *sess_scb;
gbuf_t *m;
{
- int s;
gbuf_t *mdata;
at_ddp_t *ddp;
at_atp_t *atp;
awp->param1 = sess_scb->sess_id;
awp->param2 = 0;
gbuf_freeb(m);
- ATDISABLE(s, scb->lock);
scb->sess_ioc = gbuf_next(mdata);
- ATENABLE(s, scb->lock);
gbuf_next(mdata) = 0;
asp_timout(asp_hangup, sess_scb, sess_scb->session_timer);
atp_send_rsp(scb->gref, mdata, TRUE);
} /* asp_accept */
/*
- * timer routine - funneled version
+ * timer routine - locked version
*/
-void asp_clock_funnel(arg)
+void asp_clock_locked(arg)
void *arg;
{
- thread_funnel_set(network_flock, TRUE);
+ atalk_lock();
asp_clock(arg);
- thread_funnel_set(network_flock, FALSE);
+ atalk_unlock();
}
/*
void asp_clock(arg)
void *arg;
{
- int s;
asp_scb_t *scb;
- void (*tmo_func)();
-
- ATDISABLE(s, asptmo_lock);
+ asp_tmo_func tmo_func;
+
if (scb_tmo_list)
scb_tmo_list->tmo_delta--;
while (((scb = scb_tmo_list) != 0) && (scb_tmo_list->tmo_delta == 0)) {
scb_tmo_list->prev_tmo = 0;
if ((tmo_func = scb->tmo_func) != 0) {
scb->tmo_func = 0;
- ATENABLE(s, asptmo_lock);
(*tmo_func)(scb);
- ATDISABLE(s, asptmo_lock);
}
}
- ATENABLE(s, asptmo_lock);
if (++scb_tmo_cnt == 0) scb_tmo_cnt++;
- timeout(asp_clock_funnel, (void *)arg, (1<<SESS_TMO_RES)*TICKS_PER_SEC);
+ timeout(asp_clock_locked, (void *)arg, (1<<SESS_TMO_RES)*TICKS_PER_SEC);
}
register gref_t *gref;
register gbuf_t *mioc;
{
- int s;
int len, msize, nbds;
register gbuf_t *mdata, *m, *mx;
struct atpBDS *atpBDS;
*/
awp->func = 0;
awp->param1 = 0;
- awp->param2 = (unsigned short)ASPERR_BadVersNum;
+ awp->param2 = htons((unsigned short)ASPERR_BadVersNum);
dPrintf(D_M_ASP, D_L_INFO,
(" : version=%d\n",
ASPERR_BadVersNum));
/*
* queue the connection request
*/
- ATDISABLE(s, scb->lock);
gbuf_next(mdata) = 0;
if ((m = scb->sess_ioc) == 0) {
scb->sess_ioc = mdata;
m = gbuf_next(m);
gbuf_next(m) = mdata;
}
- ATENABLE(s, scb->lock);
dPrintf(D_M_ASP, D_L_INFO,
(" : QUEUE connect request\n"));
case ASPFUNC_Command:
case ASPFUNC_Write:
if ( (scb->sess_id != awp->param1)
- || (scb->rcv_seq_num != awp->param2)
+ || (scb->rcv_seq_num != ntohs(awp->param2))
|| BAD_REMADDR(rem_addr) ) {
char era[8], ra[8];
- sprintf(era,"%d.%d", scb->rem_addr.node,scb->rem_addr.socket);
- sprintf(ra,"%d.%d", rem_addr.node,rem_addr.socket);
+ snprintf(era, sizeof(era), "%d.%d", scb->rem_addr.node,scb->rem_addr.socket);
+ snprintf(ra, sizeof(ra), "%d.%d", rem_addr.node,rem_addr.socket);
dPrintf(D_M_ASP, D_L_WARNING,
(" : DROP, id=%d,esn=%d,sn=%d,erem=%s,rem=%s\n",
scb->sess_id,scb->rcv_seq_num,awp->param2,era,ra));
command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
command_ind->Primitive = (int)awp->func;
command_ind->ReqRefNum =
- *(unsigned short *)atp->tid;
+ ntohs(*(unsigned short *)atp->tid);
command_ind->ReqType = awp->func;
mdata = gbuf_strip(mdata);
gbuf_cont(mioc) = mdata;
- ATDISABLE(s, scb->lock);
if (scb->req_flag) {
if ((mx = scb->req_msgq) != 0) {
while (gbuf_next(mx))
gbuf_next(mx) = mioc;
} else
scb->req_msgq = mioc;
- ATENABLE(s, scb->lock);
} else {
scb->req_flag = 1;
- ATENABLE(s, scb->lock);
asp_putnext(scb->gref, mioc);
}
goto l_done;
command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
command_ind->Primitive = (int)awp->func;
command_ind->ReqRefNum =
- *(unsigned short *)atp->tid;
+ ntohs(*(unsigned short *)atp->tid);
command_ind->ReqType = awp->func;
mdata = gbuf_strip(mdata);
scb->rem_addr.socket));
gbuf_next(mdata) = 0;
- ATDISABLE(s, scb->lock);
if (scb->sess_ioc)
gbuf_freel(scb->sess_ioc);
scb->sess_ioc = mdata;
scb->state = ASPSTATE_Close;
- ATENABLE(s, scb->lock);
/*
* notify upstream of the CloseSess from peer
command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
command_ind->Primitive = (int)awp->func;
command_ind->ReqRefNum =
- *(unsigned short *)atp->tid;
+ ntohs(*(unsigned short *)atp->tid);
command_ind->ReqType = awp->func;
scb->attn_tid = *(unsigned short *)atp->tid;
scb->attn_flag = 1;
case ASPSTATE_Idle:
scb->rem_addr.node = 0;
gbuf_freem(mioc);
- ATDISABLE(s, scb->lock);
if (scb->get_wait)
wakeup(&scb->event);
else
atalk_notify_sel(gref);
- ATENABLE(s, scb->lock);
return;
case ASPSTATE_WaitingForGetStatusRsp:
atpBDS = (struct atpBDS *)gbuf_rptr(mx);
cmdreply_ind = (asp_cmdreply_ind_t *)gbuf_rptr(mioc);
cmdreply_ind->Primitive = ASPFUNC_CmdReply;
- cmdreply_ind->CmdResult = *(int *)atpBDS->bdsUserData;
+ cmdreply_ind->CmdResult = ntohl(*(int *)atpBDS->bdsUserData);
gbuf_wset(mioc,sizeof(asp_cmdreply_ind_t));
gbuf_freeb(mx);
asp_putnext(scb->gref, mioc);
/* last remaining use of MSG_ERROR */
gbuf_set_type(mioc, MSG_ERROR);
- *gbuf_rptr(mioc) = (u_char)EPROTO;
+ *gbuf_rptr(mioc) = (u_char)EPROTOTYPE;
gbuf_wset(mioc, 1);
if (gbuf_cont(mioc)) {
gbuf_freem(gbuf_cont(mioc));
asp_dequeue_scb(scb)
asp_scb_t *scb;
{
- int s;
- ATDISABLE(s, aspall_lock);
if (scb == scb_used_list) {
if ((scb_used_list = scb->next_scb) != 0)
scb->next_scb->prev_scb = 0;
if ((scb->prev_scb->next_scb = scb->next_scb) != 0)
scb->next_scb->prev_scb = scb->prev_scb;
}
- ATENABLE(s, aspall_lock);
scb->next_scb = 0;
scb->prev_scb = 0;
unsigned char sock_num;
at_inet_t *rem_addr;
{
- int s;
asp_scb_t *scb;
asp_scb_t *alt_scb = 0;
- ATDISABLE(s, aspall_lock);
for (scb = asp_scbQ[sock_num]; scb; scb = scb->next_scb) {
if ((scb->rem_addr.net == rem_addr->net)
&& (scb->rem_addr.node == rem_addr->node)) {
rem_addr->node,
rem_addr->socket));
}
- ATENABLE(s, aspall_lock);
return scb;
}
*/
StaticProc void
asp_timout(func, scb, seconds)
- void (*func)();
+ asp_tmo_func func;
register asp_scb_t *scb;
int seconds;
{
- int s;
unsigned char sum;
register asp_scb_t *curr_scb, *prev_scb;
scb->tmo_delta = (seconds>>SESS_TMO_RES);
scb->tmo_cnt = scb_tmo_cnt;
- ATDISABLE(s, asptmo_lock);
if (scb_tmo_list == 0) {
scb->next_tmo = scb->prev_tmo = 0;
scb_tmo_list = scb;
- ATENABLE(s, asptmo_lock);
return;
}
scb_tmo_list->prev_tmo = scb;
scb_tmo_list = scb;
}
- ATENABLE(s, asptmo_lock);
}
/*
* untimout routine
*/
StaticProc void
-asp_untimout(func, scb)
- void (*func)();
- register asp_scb_t *scb;
+asp_untimout(
+ __unused asp_tmo_func tmo_func,
+ register asp_scb_t *scb)
{
- int s;
if ((scb->tmo_cnt == scb_tmo_cnt) || (scb->tmo_func == 0))
return;
- ATDISABLE(s, asptmo_lock);
if (scb_tmo_list == scb) {
if ((scb_tmo_list = scb->next_tmo) != 0) {
scb_tmo_list->prev_tmo = 0;
scb->prev_tmo = 0;
}
scb->tmo_func = 0;
- ATENABLE(s, asptmo_lock);
}
/*
asp_hangup(scb)
asp_scb_t *scb;
{
- int s;
-
/*
* set the state to Close
*/
- ATDISABLE(s, scb->lock);
scb->state = ASPSTATE_Close;
if (scb->tickle_tid) {
atp_cancel_req(scb->gref, (unsigned int)scb->tickle_tid);
* notify upstream of the hangup
*/
if (scb->rem_addr.node) {
- if (scb->get_wait) {
+ if (scb->get_wait)
wakeup(&scb->event);
- ATENABLE(s, scb->lock);
- } else {
- ATENABLE(s, scb->lock);
+ else
atalk_notify_sel(scb->gref);
- }
- } else
- ATENABLE(s, scb->lock);
+ }
}
StaticProc void
StaticProc asp_scb_t *
asp_scb_alloc()
{
- int s, i;
+ int i;
gbuf_t *m;
asp_scb_t *scb, *scb_array;
- ATDISABLE(s, aspall_lock);
if (scb_free_list == 0) {
if ((m = gbuf_alloc(SCBS_PER_BLK*sizeof(asp_scb_t), PRI_MED)) == 0)
- {
- ATENABLE(s, aspall_lock);
return (asp_scb_t *)0;
- }
bzero((char *)gbuf_rptr(m), SCBS_PER_BLK*sizeof(asp_scb_t));
gbuf_cont(m) = scb_resource_m;
scb_resource_m = m;
scb = scb_free_list;
scb_free_list = scb->next_scb;
- ATENABLE(s, aspall_lock);
- ATLOCKINIT(scb->lock);
- ATLOCKINIT(scb->delay_lock);
ATEVENTINIT(scb->event);
ATEVENTINIT(scb->delay_event);
asp_scb_free(scb)
asp_scb_t *scb;
{
- int s;
bzero((char *)scb, sizeof(asp_scb_t));
- ATDISABLE(s, aspall_lock);
scb->next_scb = scb_free_list;
scb_free_list = scb;
- ATENABLE(s, aspall_lock);
}
/*
gref_t *gref;
gbuf_t *mproto;
{
- int s;
gbuf_t *m;
asp_scb_t *scb;
/*
* queue the message.
*/
- ATDISABLE(s, scb->lock);
gbuf_next(mproto) = 0;
if ((m = scb->sess_ioc) == 0)
scb->sess_ioc = mproto;
if (scb->rcv_cnt >= MAX_RCV_CNT)
scb->snd_stop = 1;
- if (scb->get_wait) {
+ if (scb->get_wait)
wakeup(&scb->event);
- ATENABLE(s, scb->lock);
- } else if (mproto == scb->sess_ioc) {
- ATENABLE(s, scb->lock);
+ else if (mproto == scb->sess_ioc)
atalk_notify_sel(gref);
- } else
- ATENABLE(s, scb->lock);
+
} /* asp_putnext */
/*
2) datptr->len = size of data
*/
-int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, int flags, int *errp)
+int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, __unused int flags, int *errp)
{
- int s, i, err, len, offset, remain, size, copy_len;
- gbuf_t *mioc, *mdata, *mx, *m0;
+ int i, err, len, offset, remain, size, copy_len;
+ gbuf_t *mioc, *mdata, *mx;
ioc_t *iocbp;
strbuf_t ctlbuf;
strbuf_t datbuf;
bcopy (datptr, &datbuf, sizeof (strbuf_t));
} else {
/* being called from user space */
- if ((err = copyin((caddr_t)ctlptr, (caddr_t)&ctlbuf, sizeof(ctlbuf))) != 0)
+ if ((err = copyin(CAST_USER_ADDR_T(ctlptr), (caddr_t)&ctlbuf, sizeof(ctlbuf))) != 0)
goto l_err;
- if ((err = copyin((caddr_t)datptr, (caddr_t)&datbuf, sizeof(datbuf))) != 0)
+ if ((err = copyin(CAST_USER_ADDR_T(datptr), (caddr_t)&datbuf, sizeof(datbuf))) != 0)
goto l_err;
}
+ /* Radar 5398072: check for bogus length
+ * Max ASP data is 8 ATP packets
+ */
+
+ if ((ctlbuf.len < 0) || (ctlbuf.len > (ATP_DATA_SIZE * 8))) {
+ err = EINVAL;
+ goto l_err;
+ }
+ if ((datbuf.len < 0) || (datbuf.len > (ATP_DATA_SIZE * 8))) {
+ err = EINVAL;
+ goto l_err;
+ }
+
/*
* allocate buffer and copy in the control content
*/
bcopy (ctlbuf.buf, gbuf_rptr(mioc), ctlbuf.len);
} else {
/* being called from user space */
- if ((err = copyin((caddr_t)ctlbuf.buf, (caddr_t)gbuf_rptr(mioc), ctlbuf.len)) != 0) {
+ if ((err = copyin(CAST_USER_ADDR_T(ctlbuf.buf), (caddr_t)gbuf_rptr(mioc), ctlbuf.len)) != 0) {
gbuf_freem(mioc);
goto l_err;
}
remain -= copy_len;
if (mreq != NULL)
bcopy (dataptr, (gbuf_rptr(mdata) + offset), copy_len);
- else if ((err = copyin(dataptr, (caddr_t)(gbuf_rptr(mdata) + offset), copy_len)) != 0) {
+ else if ((err = copyin(CAST_USER_ADDR_T(dataptr), (caddr_t)(gbuf_rptr(mdata) + offset), copy_len)) != 0) {
gbuf_freem(mioc);
goto l_err;
}
/*
* build the command/write/write_continue request
*/
- wptr = gbuf_rptr(mdata);
+ wptr = (unsigned char *)gbuf_rptr(mdata);
atpBDS = (struct atpBDS *)wptr;
wptr += atpBDSsize;
for (i=0; i < ATP_TRESP_MAX; i++) {
awp = (asp_word_t *)atp->user_bytes;
awp->func = (unsigned char)Primitive;
awp->param1 = scb->sess_id;
- awp->param2 = scb->snd_seq_num;
+ awp->param2 = htons(scb->snd_seq_num);
iocbp->ioc_private = (void *)scb;
iocbp->ioc_count = gbuf_len(mdata);
iocbp->ioc_rval = 0;
/*
* send the command/write/write_continue/attention request
*/
- ATDISABLE(s, scb->lock);
switch (awp->func) {
case ASPFUNC_Command:
scb->state = ASPSTATE_WaitingForCommandRsp;
break;
case ASPFUNC_WriteContinue:
scb->state = ASPSTATE_WaitingForWriteContinueRsp;
- awp->param2 = scb->wrt_seq_num;
+ awp->param2 = htons(scb->wrt_seq_num);
break;
case ASPFUNC_Attention:
scb->state = ASPSTATE_WaitingForCommandRsp;
atp->xo_relt = 0;
atp->bitmap = 0x01;
gbuf_wdec(mdata,2);
- awp->param2 = *(unsigned short *)gbuf_wptr(mdata);
+ awp->param2 = htons(*(unsigned short *)gbuf_wptr(mdata));
break;
}
- ATENABLE(s, scb->lock);
dPrintf(D_M_ASP,D_L_INFO,
("ASPputmsg: %s, loc=%d, rem=%x.%x.%d\n",
(awp->func == ASPFUNC_Command ? "CommandReq" :
case ASPFUNC_CmdReply:
- ATDISABLE(s, scb->lock);
if (scb->req_msgq) {
mx = scb->req_msgq;
scb->req_msgq = gbuf_next(mx);
gbuf_next(mx) = 0;
- ATENABLE(s, scb->lock);
asp_putnext(scb->gref, mx);
- } else {
+ } else
scb->req_flag = 0;
- ATENABLE(s, scb->lock);
- }
+
result = primitives->CmdReplyReq.CmdResult;
tid = primitives->CmdReplyReq.ReqRefNum;
ddp->dst_socket = scb->reply_socket;
ddp->type = DDP_ATP;
UAS_ASSIGN(ddp->checksum, 0);
- UAS_ASSIGN(atp->tid, tid);
+ UAS_ASSIGN(atp->tid, htons(tid));
if (scb->attn_flag && (tid == scb->attn_tid)) {
scb->attn_flag = 0;
atp->xo = 0;
/* bms: make this callable from kernel. reply date is passed back as a mbuf chain in *mreply */
-int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply, int *flags, int *errp)
+int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply, __unused int *flags, int *errp)
{
- int err, s, len, sum, rval;
+ int err, len, sum, rval;
gbuf_t *mproto, *mdata;
strbuf_t ctlbuf;
strbuf_t datbuf;
return -1;
}
- ATDISABLE(s, scb->lock);
- if (scb->state == ASPSTATE_Close) {
- ATENABLE(s, scb->lock);
+ if (scb->state == ASPSTATE_Close)
return 0;
- }
/*
* get receive data
*/
while ((mproto = scb->sess_ioc) == 0) {
scb->get_wait = 1;
- err = tsleep(&scb->event, PSOCK | PCATCH, "aspgetmsg", 0);
+ lck_mtx_assert(atalk_mutex, LCK_MTX_ASSERT_OWNED);
+ err = msleep(&scb->event, atalk_mutex, PSOCK | PCATCH, "aspgetmsg", 0);
if (err != 0) {
scb->get_wait = 0;
- ATENABLE(s, scb->lock);
*errp = err;
return -1;
}
if (scb->state == ASPSTATE_Close) {
scb->get_wait = 0;
- ATENABLE(s, scb->lock);
return 0;
}
}
get_wait = scb->get_wait;
scb->get_wait = 0;
- if ((ctlptr == 0) && (datptr == 0)) {
- ATENABLE(s, scb->lock);
+ if ((ctlptr == 0) && (datptr == 0))
return 0;
- }
scb->sess_ioc = gbuf_next(mproto);
mdata = gbuf_cont(mproto);
- ATENABLE(s, scb->lock);
/* last remaining use of MSG_ERROR */
if (gbuf_type(mproto) == MSG_ERROR) {
bcopy (datptr, &datbuf, sizeof(datbuf));
} else {
/* called from user space */
- if ((err = copyin((caddr_t)ctlptr,
+ if ((err = copyin(CAST_USER_ADDR_T(ctlptr),
(caddr_t)&ctlbuf, sizeof(ctlbuf))) != 0)
goto l_err;
- if ((err = copyin((caddr_t)datptr,
+ if ((err = copyin(CAST_USER_ADDR_T(datptr),
(caddr_t)&datbuf, sizeof(datbuf))) != 0)
goto l_err;
}
if ((datbuf.maxlen < 0) || (datbuf.maxlen < gbuf_msgsize(mdata))) {
- ATDISABLE(s, scb->lock);
gbuf_next(mproto) = scb->sess_ioc;
scb->sess_ioc = mproto;
- ATENABLE(s, scb->lock);
return MOREDATA;
}
* we're not supposed to dequeue messages in the Streams
* head's read queue this way; but there is no better way.
*/
- ATDISABLE(s, scb->lock);
- if (scb->sess_ioc == 0) {
- ATENABLE(s, scb->lock);
- } else {
- ATENABLE(s, scb->lock);
+ if (scb->sess_ioc != 0)
atalk_notify_sel(gref);
- }
+
}
/*
} else {
/* called from user space */
if ((err = copyout((caddr_t)gbuf_rptr(mproto),
- (caddr_t)ctlbuf.buf, ctlbuf.len)) != 0)
+ CAST_USER_ADDR_T(ctlbuf.buf), ctlbuf.len)) != 0)
goto l_err;
if ((err = copyout((caddr_t)&ctlbuf,
- (caddr_t)ctlptr, sizeof(ctlbuf))) != 0)
+ CAST_USER_ADDR_T(ctlptr), sizeof(ctlbuf))) != 0)
goto l_err;
}
if (mreply == NULL) {
/* called from user space */
- if ((err = copyout((caddr_t)gbuf_rptr(mdata), (caddr_t)&datbuf.buf[sum], len)) != 0)
+ if ((err = copyout((caddr_t)gbuf_rptr(mdata), CAST_USER_ADDR_T(&datbuf.buf[sum]), len)) != 0)
goto l_err;
}
sum += len;
bcopy (&datbuf, datptr, sizeof(datbuf));
} else {
/* called from user space */
- if ((err = copyout((caddr_t)&datbuf, (caddr_t)datptr, sizeof(datbuf))) != 0)
+ if ((err = copyout((caddr_t)&datbuf, CAST_USER_ADDR_T(datptr), sizeof(datbuf))) != 0)
goto l_err;
}
gbuf_freem(mproto);
}
- ATDISABLE(s, scb->lock);
if (scb->sess_ioc)
scb->rcv_cnt--;
else {
scb->rcv_cnt = 0;
scb->snd_stop = 0;
}
- ATENABLE(s, scb->lock);
return rval;
l_err:
- ATDISABLE(s, scb->lock);
gbuf_next(mproto) = scb->sess_ioc;
scb->sess_ioc = mproto;
- ATENABLE(s, scb->lock);
*errp = err;
return -1;
}
projects / apple / xnu.git / blobdiff