Hello,
I finished my import of missing pieces from Kamailio SVN repository. The commit message did not make it though to the list because it was too big. I haven't commited my changes into the master branch yet, I uploaded them to the branch janakj/missing_imports and I would appreciate if people (especially K. developers) could review them, here is a link to the new branch:
http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=shortlog;h=refs/...
And here is a short summary of the changes:
1) kamailio/etc was imported into sip-router/etc In Kamailio trunk the etc directory contains a kamailio.cfg files, a RADIUS dictionary and TLS certificates and related files.
2) kamailio/packaging was imported into sip-router/pkg/kamailio I thought that it would be good to have both version of packaging files under one directory in the shared repository. To avoid conflicts with existing directories and files, I imported Kamailio stuff into pkg/kamailio. We will need to go through these files and merge them at some point (or alternatively keep one version and delete the other).
3) kamailio/scripts was imported into sip-router/tools No coflics there, so I did not touch the files imported from Kamailio. I would, however, suggest that as the next step we move kamctl and kamdbctl into subdirectories. Booth tools consist of several files and would be, IMHO, better to have them cleanly separated.
4) kamailio/utils/{db_berkeley,db_oracle,kamunix,profile} were imported into sip-router/utils. I omited kamailio/utils/fif_relay because the same tool is already present in sip-router repository--and it is not needed anymore anyway.
What is missing: I also found extra TLS documentation in kamailio/tls/doc. The documentation was probably not yet imported into the sip-router repository so I will look into that.
Please take a moment and review the layout, if people are happy with my proposed layout and nobody speaks up then I will merge those changes into the master branch on Wednesday.
Jan.
Done, I just merged the branch into the master.
Jan.
On 22-06 18:47, Jan Janak wrote:
Hello,
I finished my import of missing pieces from Kamailio SVN repository. The commit message did not make it though to the list because it was too big. I haven't commited my changes into the master branch yet, I uploaded them to the branch janakj/missing_imports and I would appreciate if people (especially K. developers) could review them, here is a link to the new branch:
http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=shortlog;h=refs/...
And here is a short summary of the changes:
kamailio/etc was imported into sip-router/etc In Kamailio trunk the etc directory contains a kamailio.cfg files, a RADIUS dictionary and TLS certificates and related files.
kamailio/packaging was imported into sip-router/pkg/kamailio I thought that it would be good to have both version of packaging files under one directory in the shared repository. To avoid conflicts with existing directories and files, I imported Kamailio stuff into pkg/kamailio. We will need to go through these files and merge them at some point (or alternatively keep one version and delete the other).
kamailio/scripts was imported into sip-router/tools No coflics there, so I did not touch the files imported from Kamailio. I would, however, suggest that as the next step we move kamctl and kamdbctl into subdirectories. Booth tools consist of several files and would be, IMHO, better to have them cleanly separated.
kamailio/utils/{db_berkeley,db_oracle,kamunix,profile} were imported into sip-router/utils. I omited kamailio/utils/fif_relay because the same tool is already present in sip-router repository--and it is not needed anymore anyway.
What is missing: I also found extra TLS documentation in kamailio/tls/doc. The documentation was probably not yet imported into the sip-router repository so I will look into that.
Please take a moment and review the layout, if people are happy with my proposed layout and nobody speaks up then I will merge those changes into the master branch on Wednesday.
Jan.
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Jan Janak writes:
- kamailio/etc was imported into sip-router/etc In Kamailio trunk the etc directory contains a kamailio.cfg files, a RADIUS dictionary and TLS certificates and related files.
looks like default config file in Makefile and man page is called ser something. could those be changed to sip-router?
-- juha
On Wed, Jun 24, 2009 at 1:54 PM, Juha Heinanenjh@tutpro.com wrote:
Jan Janak writes:
> 1) kamailio/etc was imported into sip-router/etc > In Kamailio trunk the etc directory contains a kamailio.cfg files, > a RADIUS dictionary and TLS certificates and related files.
looks like default config file in Makefile and man page is called ser something. could those be changed to sip-router?
Yes, could you, please, change it?
Jan.
On 06/24/2009 02:00 PM, Jan Janak wrote:
On Wed, Jun 24, 2009 at 1:54 PM, Juha Heinanenjh@tutpro.com wrote:
Jan Janak writes:
- kamailio/etc was imported into sip-router/etc In Kamailio trunk the etc directory contains a kamailio.cfg files, a RADIUS dictionary and TLS certificates and related files.
looks like default config file in Makefile and man page is called ser something. could those be changed to sip-router?
Yes, could you, please, change it?
it should stay so as the main binary is still ser. Maybe the makefile should be updated to take in consideration the binary name.
Cheers, Daniel
Jan.
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
On Wed, Jun 24, 2009 at 2:07 PM, Daniel-Constantin Mierlamiconda@gmail.com wrote:
On 06/24/2009 02:00 PM, Jan Janak wrote:
On Wed, Jun 24, 2009 at 1:54 PM, Juha Heinanenjh@tutpro.com wrote:
Jan Janak writes:
> 1) kamailio/etc was imported into sip-router/etc > In Kamailio trunk the etc directory contains a kamailio.cfg files, > a RADIUS dictionary and TLS certificates and related files.
looks like default config file in Makefile and man page is called ser something. could those be changed to sip-router?
Yes, could you, please, change it?
it should stay so as the main binary is still ser. Maybe the makefile should be updated to take in consideration the binary name.
If it was up to me, I would rename it to sip-router too.
Jan.