Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sctp: factor out sctp_sendmsg_update_sinfo from sctp_sendmsg

Browse source 
This patch is to move the codes for trying to get sinfo from
asoc into sctp_sendmsg_update_sinfo.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2018-03-01 23:05:15 +08:00 • committed by David S. Miller
parent 204f817fb9
commit d42cb06e5b
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
net/sctp/socket.c
View file

@ -1892,6 +1892,21 @@ static union sctp_addr *sctp_sendmsg_get_daddr(struct sock *sk,
return daddr; return daddr;
} }
static void sctp_sendmsg_update_sinfo(struct sctp_association *asoc,
struct sctp_sndrcvinfo *sinfo,
struct sctp_cmsgs *cmsgs)
{
if (!cmsgs->srinfo && !cmsgs->sinfo) {
sinfo->sinfo_stream = asoc->default_stream;
sinfo->sinfo_ppid = asoc->default_ppid;
sinfo->sinfo_context = asoc->default_context;
sinfo->sinfo_assoc_id = sctp_assoc2id(asoc);
}
if (!cmsgs->srinfo)
sinfo->sinfo_timetolive = asoc->default_timetolive;
}
static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len)
{ {
struct sctp_endpoint *ep = sctp_sk(sk)->ep; struct sctp_endpoint *ep = sctp_sk(sk)->ep;
@ -1951,15 +1966,8 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len)
new_asoc = asoc; new_asoc = asoc;
} }
if (!cmsgs.srinfo && !cmsgs.sinfo) { /* Update snd_info with the asoc */
sinfo->sinfo_stream = asoc->default_stream; sctp_sendmsg_update_sinfo(asoc, sinfo, &cmsgs);
sinfo->sinfo_ppid = asoc->default_ppid;
sinfo->sinfo_context = asoc->default_context;
sinfo->sinfo_assoc_id = sctp_assoc2id(asoc);
}
if (!cmsgs.srinfo)
sinfo->sinfo_timetolive = asoc->default_timetolive;
/* If an address is passed with the sendto/sendmsg call, it is used /* If an address is passed with the sendto/sendmsg call, it is used
* to override the primary destination address in the TCP model, or * to override the primary destination address in the TCP model, or