[Home]

Summary:ASTERISK-10181: [patch] Free memory when pbx_dundi is unloaded
Reporter:James Golovich (jamesgolovich)Labels:
Date Opened:2007-08-27 21:02:03Date Closed:2007-09-11 09:39:37
Priority:MinorRegression?No
Status:Closed/CompleteComponents:PBX/pbx_dundi
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) asterisk-dundifree.diff.txt
Description:I don't have a big dundi setup, but I threw some stuff together to see how this would go.  There might be some stuff thats missing, but in my basic setup of just uncommenting the peers in the sample config this takes care of it.

If someone can test this out on a larger setup and let me know if I missed anything I can fix it up
Comments:By: Russell Bryant (russell) 2007-08-28 10:06:19

This patch looks good.  You should go ahead and try committing this using your certificate.  This patch should be applied to 1.4 and trunk, so you get to do the whole merge process, too.  I'll run through all of the commands to try to help clarify the process ...

$ svn co https://origsvn.digium.com/svn/repotools
$ cd repotools

Copy the "svnmerge" application to somewhere in your PATH.  There are also some helper tools in there to make svnmerge easier to use so you don't have to type in your password over and over.  However, I have my password in my svn config so I have never used them.  There may be info about them on asterisk.org.  If you want to install all of the helper scripts into /usr/bin, you can just run "make install".

$ svn co https://origsvn.digium.com/svn/asterisk/branches/1.4 asterisk-1.4
$ svn co https://origsvn.digium.com/svn/asterisk/trunk asterisk-trunk

$ cd asterisk-1.4
$ patch -p0 < asterisk-dundifree.diff.txt
$ svn commit

In the commit message, in addition to saying what the patch does, you can also insert special tags to have the commit linked to mantis issues.  "issue ASTERISK-10181" will have the commit show up in this issue.  "closes issue ASTERISK-10181" will have the issue automatically closed by the commit.

$ cd ../asterisk-trunk
$ svnmerge merge -r 12345 -f ../merge-commit.msg -P branch-1.4-merged

This merges revision 12345 from 1.4 into trunk and generates a commit message for you in the file ../merge-commit.msg.  It sets a special svn property, branch-1.4-merged, which keeps track of which revisions have been merged from 1.4 into trunk.

$ make (to ensure the merge was all good)

If the merge has conflicts, you have to fix them manually.  After resolving the conflict, you run "svn resolved pbx/pbx_dundi.c" to tell svn that you have fixed it up.  Otherwise, it won't let you commit.

$ svn commit -F ../merge-commit.msg

By: Russell Bryant (russell) 2007-08-28 10:12:53

Silly Mantis.  Note that the special tags for commits are written as "issue <pound>1234" or "closes issue <pound>1234".

By: Digium Subversion (svnbot) 2007-09-11 09:38:05

Repository: asterisk
Revision: 82243

------------------------------------------------------------------------
r82243 | file | 2007-09-11 09:38:04 -0500 (Tue, 11 Sep 2007) | 6 lines

(closes issue ASTERISK-10181)
Reported by: jamesgolovich
Patches:
     asterisk-dundifree.diff.txt uploaded by jamesgolovich (license 176)
Don't leak memory when unloading DUNDi.

------------------------------------------------------------------------

By: Digium Subversion (svnbot) 2007-09-11 09:39:37

Repository: asterisk
Revision: 82244

------------------------------------------------------------------------
r82244 | file | 2007-09-11 09:39:36 -0500 (Tue, 11 Sep 2007) | 14 lines

Merged revisions 82243 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82243 | file | 2007-09-11 11:56:39 -0300 (Tue, 11 Sep 2007) | 6 lines

(closes issue ASTERISK-10181)
Reported by: jamesgolovich
Patches:
     asterisk-dundifree.diff.txt uploaded by jamesgolovich (license 176)
Don't leak memory when unloading DUNDi.

........

------------------------------------------------------------------------