Commit 92c73af5 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller

sctp: make heartbeat information in sctp_make_heartbeat()

Make heartbeat information in sctp_make_heartbeat() instead
of make it in sctp_sf_heartbeat() directly for common using.
Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de6becdc
...@@ -232,9 +232,7 @@ struct sctp_chunk *sctp_make_violation_paramlen(const struct sctp_association *, ...@@ -232,9 +232,7 @@ struct sctp_chunk *sctp_make_violation_paramlen(const struct sctp_association *,
const struct sctp_chunk *, const struct sctp_chunk *,
struct sctp_paramhdr *); struct sctp_paramhdr *);
struct sctp_chunk *sctp_make_heartbeat(const struct sctp_association *, struct sctp_chunk *sctp_make_heartbeat(const struct sctp_association *,
const struct sctp_transport *, const struct sctp_transport *);
const void *payload,
const size_t paylen);
struct sctp_chunk *sctp_make_heartbeat_ack(const struct sctp_association *, struct sctp_chunk *sctp_make_heartbeat_ack(const struct sctp_association *,
const struct sctp_chunk *, const struct sctp_chunk *,
const void *payload, const void *payload,
......
...@@ -1075,20 +1075,28 @@ struct sctp_chunk *sctp_make_violation_paramlen( ...@@ -1075,20 +1075,28 @@ struct sctp_chunk *sctp_make_violation_paramlen(
/* Make a HEARTBEAT chunk. */ /* Make a HEARTBEAT chunk. */
struct sctp_chunk *sctp_make_heartbeat(const struct sctp_association *asoc, struct sctp_chunk *sctp_make_heartbeat(const struct sctp_association *asoc,
const struct sctp_transport *transport, const struct sctp_transport *transport)
const void *payload, const size_t paylen)
{ {
struct sctp_chunk *retval = sctp_make_chunk(asoc, SCTP_CID_HEARTBEAT, struct sctp_chunk *retval;
0, paylen); sctp_sender_hb_info_t hbinfo;
retval = sctp_make_chunk(asoc, SCTP_CID_HEARTBEAT, 0, sizeof(hbinfo));
if (!retval) if (!retval)
goto nodata; goto nodata;
hbinfo.param_hdr.type = SCTP_PARAM_HEARTBEAT_INFO;
hbinfo.param_hdr.length = htons(sizeof(sctp_sender_hb_info_t));
hbinfo.daddr = transport->ipaddr;
hbinfo.sent_at = jiffies;
hbinfo.hb_nonce = transport->hb_nonce;
/* Cast away the 'const', as this is just telling the chunk /* Cast away the 'const', as this is just telling the chunk
* what transport it belongs to. * what transport it belongs to.
*/ */
retval->transport = (struct sctp_transport *) transport; retval->transport = (struct sctp_transport *) transport;
retval->subh.hbs_hdr = sctp_addto_chunk(retval, paylen, payload); retval->subh.hbs_hdr = sctp_addto_chunk(retval, sizeof(hbinfo),
&hbinfo);
nodata: nodata:
return retval; return retval;
......
...@@ -941,18 +941,9 @@ static sctp_disposition_t sctp_sf_heartbeat(const struct sctp_endpoint *ep, ...@@ -941,18 +941,9 @@ static sctp_disposition_t sctp_sf_heartbeat(const struct sctp_endpoint *ep,
{ {
struct sctp_transport *transport = (struct sctp_transport *) arg; struct sctp_transport *transport = (struct sctp_transport *) arg;
struct sctp_chunk *reply; struct sctp_chunk *reply;
sctp_sender_hb_info_t hbinfo;
size_t paylen = 0;
hbinfo.param_hdr.type = SCTP_PARAM_HEARTBEAT_INFO;
hbinfo.param_hdr.length = htons(sizeof(sctp_sender_hb_info_t));
hbinfo.daddr = transport->ipaddr;
hbinfo.sent_at = jiffies;
hbinfo.hb_nonce = transport->hb_nonce;
/* Send a heartbeat to our peer. */ /* Send a heartbeat to our peer. */
paylen = sizeof(sctp_sender_hb_info_t); reply = sctp_make_heartbeat(asoc, transport);
reply = sctp_make_heartbeat(asoc, transport, &hbinfo, paylen);
if (!reply) if (!reply)
return SCTP_DISPOSITION_NOMEM; return SCTP_DISPOSITION_NOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment