diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-01-20 19:28:15 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-01-20 19:28:15 +0100 |
| commit | 050577a088f6e8cfd02dca82fe47b4b34b53ae4e (patch) | |
| tree | 226e9710faebb387f5d8e16175e4ac0775c8dcbf | |
| parent | 95057b923710b3d1b4109f36ebed24011b294d97 (diff) | |
mtp: Return SLTA on the same SLS, send SLTM with a static sls
Derive the SLS from the static link_no we have assigned.
| -rw-r--r-- | src/mtp_layer3.c | 9 | ||||
| -rw-r--r-- | src/mtp_link.c | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mtp_layer3.c b/src/mtp_layer3.c index 4f6fa87..67ae70e 100644 --- a/src/mtp_layer3.c +++ b/src/mtp_layer3.c @@ -53,7 +53,8 @@ struct msgb *mtp_msg_alloc(struct mtp_link_set *link) return msg; } -static struct msgb *mtp_create_slta(struct mtp_link_set *link, struct mtp_level_3_mng *in_mng, int l3_len) +static struct msgb *mtp_create_slta(struct mtp_link_set *link, int sls, + struct mtp_level_3_mng *in_mng, int l3_len) { struct mtp_level_3_hdr *hdr; struct mtp_level_3_mng *mng; @@ -64,6 +65,8 @@ static struct msgb *mtp_create_slta(struct mtp_link_set *link, struct mtp_level_ hdr = (struct mtp_level_3_hdr *) out->l2h; hdr->ser_ind = MTP_SI_MNT_REG_MSG; + hdr->addr = MTP_ADDR(sls, link->dpc, link->opc); + mng = (struct mtp_level_3_mng *) msgb_put(out, sizeof(*mng)); mng->cmn.h0 = MTP_TST_MSG_GRP; mng->cmn.h1 = MTP_TST_MSG_SLTA; @@ -349,7 +352,9 @@ static int mtp_link_regular_msg(struct mtp_link *link, struct mtp_level_3_hdr *h switch (mng->cmn.h1) { case MTP_TST_MSG_SLTM: /* simply respond to the request... */ - out = mtp_create_slta(link->set, mng, l3_len); + out = mtp_create_slta(link->set, + MTP_LINK_SLS(hdr->addr), + mng, l3_len); if (!out) return -1; mtp_link_set_submit(link, out); diff --git a/src/mtp_link.c b/src/mtp_link.c index efd49c9..5e5f418 100644 --- a/src/mtp_link.c +++ b/src/mtp_link.c @@ -37,6 +37,7 @@ static struct msgb *mtp_create_sltm(struct mtp_link *link) hdr = (struct mtp_level_3_hdr *) msg->l2h; hdr->ser_ind = MTP_SI_MNT_REG_MSG; + hdr->addr = MTP_ADDR(link->link_no % 16, link->set->dpc, link->set->opc); mng = (struct mtp_level_3_mng *) msgb_put(msg, sizeof(*mng)); mng->cmn.h0 = MTP_TST_MSG_GRP; |