[Asterisk-code-review] openr2(1/6): bugfix in configuration saving (...asterisk[16])

[Friendly Automation]

Friendly Automation has submitted this change and it was merged. ( https://gerrit.asterisk.org/c/asterisk/+/11603 )

Change subject: openr2(1/6): bugfix in configuration saving
......................................................................

openr2(1/6): bugfix in configuration saving

Details:
  - The memcpy() call copied part of "dahdi_conf" and not "dahdi_conf.mfcr2"
  - As a result, the memcmp() in dahdi_r2_get_link() always fails
  - This cause dahdi_r2_get_link() to create new link for every channel
    (instead of a new link for every ~30 channels)
  - With the fix, far less links are generated -- so we use far less threads

Change-Id: I7259dd6272f5e46e8a6c7f5bf3e8c2ec01b8c132
Signed-off-by: Oron Peled <oron.peled at xorcom.com>
---
M channels/chan_dahdi.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 434bd16..f204e3c 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -11925,7 +11925,7 @@
 		}
 	}
 	/* Save the configuration used to setup this link */
-	memcpy(&r2_link->conf, conf, sizeof(r2_link->conf));
+	memcpy(&r2_link->conf, &conf->mfcr2, sizeof(r2_link->conf));
 	return 0;
 }
 #endif

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/11603
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: I7259dd6272f5e46e8a6c7f5bf3e8c2ec01b8c132
Gerrit-Change-Number: 11603
Gerrit-PatchSet: 2
Gerrit-Owner: Oron Peled <oron.peled at xorcom.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190723/e446b205/attachment.html>