Module: kamailio Branch: master Commit: dab4692da5b0969f29259ca5476e874e6d318209 URL: https://github.com/kamailio/kamailio/commit/dab4692da5b0969f29259ca5476e874e...

Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@edvina.net Date: 2015-03-16T19:27:56+01:00

Merge branch 'master' into uacregstat

* master: (61 commits) dialplan: Remove SVN ID's and history notes pua: Remove SVN ID and history siptrace: Remove SVN ID xhttp_rpc: Remove SVN ID xmlrpc: Remove SVN ID's rtpengine: small addition to nh_show_rtpp ndb_redis: enable authentication when reconnecting. pkg/kamailio/deb: update version to 4.3.0~dev5 jsonrpc-s: implementation of FIFO transport Makefile.defs: version set to 4.3.0-dev5 Makefile.groups: added module auth_xkeys in the main group geoip: updated the documentation with contc geoip2: added continet conde for new geoip api pv geoip: continent code attribute name changed to contc auth_xkeys: remove unused variable: hbody db_mysql: Remove SVN ID's, remove history sections xmlrpc: Improve doc presence: Remove svn id, remove history geoip: return continent id via contid attribute ctl: use uid/gid from the core if not set for the module ...

---

Added: modules/auth_xkeys/Makefile Added: modules/auth_xkeys/README Added: modules/auth_xkeys/auth_xkeys.c Added: modules/auth_xkeys/auth_xkeys.h Added: modules/auth_xkeys/auth_xkeys_mod.c Added: modules/auth_xkeys/doc/Makefile Added: modules/auth_xkeys/doc/auth_xkeys.xml Added: modules/auth_xkeys/doc/auth_xkeys_admin.xml Added: modules/ims_charging/ims_charging_stats.c Added: modules/ims_charging/ims_charging_stats.h Added: modules/ims_qos/ims_qos_stats.c Added: modules/ims_qos/ims_qos_stats.h Added: utils/kamctl/mysql/dialog_ng-create.sql Modified: Makefile.defs Modified: Makefile.groups Modified: main.c Modified: modules/cdp_avp/imsapp.h Modified: modules/ctl/ctl.c Modified: modules/db_cluster/dbcl_api.c Modified: modules/db_mysql/km_db_mysql.c Modified: modules/db_mysql/km_db_mysql.h Modified: modules/db_mysql/km_dbase.c Modified: modules/db_mysql/km_dbase.h Modified: modules/db_mysql/km_my_con.c Modified: modules/db_mysql/km_my_con.h Modified: modules/db_mysql/km_res.c Modified: modules/db_mysql/km_res.h Modified: modules/db_mysql/km_row.c Modified: modules/db_mysql/km_row.h Modified: modules/db_mysql/km_val.c Modified: modules/db_mysql/km_val.h Modified: modules/db_mysql/my_cmd.c Modified: modules/db_mysql/my_cmd.h Modified: modules/db_mysql/my_con.c Modified: modules/db_mysql/my_con.h Modified: modules/db_mysql/my_fld.c Modified: modules/db_mysql/my_fld.h Modified: modules/db_mysql/my_res.c Modified: modules/db_mysql/my_res.h Modified: modules/db_mysql/my_uri.c Modified: modules/db_mysql/my_uri.h Modified: modules/db_mysql/mysql_mod.c Modified: modules/db_mysql/mysql_mod.h Modified: modules/dialog_ng/dialog.c Modified: modules/dialog_ng/dlg_cb.c Modified: modules/dialplan/dialplan.c Modified: modules/dialplan/dialplan.h Modified: modules/dialplan/dp_db.c Modified: modules/dialplan/dp_db.h Modified: modules/dialplan/dp_repl.c Modified: modules/dmq/README Modified: modules/dmq/bind_dmq.c Modified: modules/dmq/bind_dmq.h Modified: modules/dmq/dmq.c Modified: modules/dmq/dmq.h Modified: modules/dmq/dmq_funcs.c Modified: modules/dmq/dmq_funcs.h Modified: modules/dmq/dmqnode.c Modified: modules/dmq/dmqnode.h Modified: modules/dmq/doc/dmq.xml Modified: modules/dmq/doc/dmq_admin.xml Modified: modules/dmq/message.c Modified: modules/dmq/message.h Modified: modules/dmq/notification_peer.c Modified: modules/dmq/notification_peer.h Modified: modules/dmq/peer.c Modified: modules/dmq/peer.h Modified: modules/dmq/worker.c Modified: modules/dmq/worker.h Modified: modules/enum/README Modified: modules/enum/doc/enum_admin.xml Modified: modules/geoip/README Modified: modules/geoip/doc/geoip_admin.xml Modified: modules/geoip/geoip_pv.c Modified: modules/geoip2/README Modified: modules/geoip2/doc/geoip2_admin.xml Modified: modules/geoip2/geoip2_pv.c Modified: modules/htable/Makefile Modified: modules/htable/api.c Modified: modules/htable/api.h Modified: modules/htable/ht_api.c Modified: modules/htable/ht_api.h Modified: modules/htable/ht_db.c Modified: modules/htable/ht_db.h Modified: modules/htable/ht_var.c Modified: modules/htable/ht_var.h Modified: modules/ims_charging/Ro_data.c Modified: modules/ims_charging/Ro_data.h Modified: modules/ims_charging/ccr.c Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/ims_ro.h Modified: modules/ims_charging/mod.c Modified: modules/ims_charging/ro_session_hash.c Modified: modules/ims_charging/ro_session_hash.h Modified: modules/ims_charging/ro_timer.c Modified: modules/ims_qos/cdpeventprocessor.c Modified: modules/ims_qos/mod.c Modified: modules/ims_qos/rx_aar.c Modified: modules/ims_qos/rx_asr.c Modified: modules/jsonrpc-s/README Modified: modules/jsonrpc-s/doc/jsonrpc-s_admin.xml Modified: modules/jsonrpc-s/jsonrpc-s_mod.c Modified: modules/kazoo/defs.h Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_pua.c Modified: modules/ldap/ldap_connect.c Modified: modules/msrp/msrp_cmap.c Modified: modules/msrp/msrp_cmap.h Modified: modules/msrp/msrp_env.c Modified: modules/msrp/msrp_env.h Modified: modules/msrp/msrp_mod.c Modified: modules/msrp/msrp_netio.c Modified: modules/msrp/msrp_netio.h Modified: modules/msrp/msrp_parser.c Modified: modules/msrp/msrp_parser.h Modified: modules/msrp/msrp_vars.c Modified: modules/msrp/msrp_vars.h Modified: modules/ndb_redis/redis_client.c Modified: modules/presence/bind_presence.c Modified: modules/presence/bind_presence.h Modified: modules/presence/event_list.c Modified: modules/presence/event_list.h Modified: modules/presence/hash.c Modified: modules/presence/hash.h Modified: modules/presence/notify.c Modified: modules/presence/notify.h Modified: modules/presence/presence.c Modified: modules/presence/presence.h Modified: modules/presence/presentity.c Modified: modules/presence/presentity.h Modified: modules/presence/publish.c Modified: modules/presence/publish.h Modified: modules/presence/subscribe.c Modified: modules/presence/subscribe.h Modified: modules/presence/utils_func.c Modified: modules/presence/utils_func.h Modified: modules/presence_dialoginfo/notify_body.c Modified: modules/pua/add_events.c Modified: modules/pua/add_events.h Modified: modules/pua/event_list.c Modified: modules/pua/event_list.h Modified: modules/pua/hash.c Modified: modules/pua/hash.h Modified: modules/pua/pidf.c Modified: modules/pua/pidf.h Modified: modules/pua/pua.c Modified: modules/pua/pua.h Modified: modules/pua/pua_bind.c Modified: modules/pua/pua_bind.h Modified: modules/pua/pua_callback.c Modified: modules/pua/pua_callback.h Modified: modules/pua/pua_db.c Modified: modules/pua/pua_db.h Modified: modules/pua/send_publish.c Modified: modules/pua/send_publish.h Modified: modules/pua/send_subscribe.c Modified: modules/pua/send_subscribe.h Modified: modules/registrar/README Modified: modules/registrar/doc/registrar_admin.xml Modified: modules/registrar/regpv.c Modified: modules/rls/notify.c Modified: modules/rls/notify.h Modified: modules/rls/resource_notify.c Modified: modules/rls/resource_notify.h Modified: modules/rls/rls.c Modified: modules/rls/rls.h Modified: modules/rls/rls_db.c Modified: modules/rls/subscribe.c Modified: modules/rls/subscribe.h Modified: modules/rr/api.c Modified: modules/rr/api.h Modified: modules/rr/loose.c Modified: modules/rr/loose.h Modified: modules/rr/record.c Modified: modules/rr/record.h Modified: modules/rr/rr_cb.c Modified: modules/rr/rr_cb.h Modified: modules/rr/rr_mod.c Modified: modules/rr/rr_mod.h Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/sanity/api.h Modified: modules/sanity/mod_sanity.c Modified: modules/sanity/mod_sanity.h Modified: modules/sanity/sanity.c Modified: modules/sanity/sanity.h Modified: modules/siptrace/siptrace.c Modified: modules/sqlops/sql_api.c Modified: modules/tcpops/README Modified: modules/tcpops/doc/functions.xml Modified: modules/textops/textops.c Modified: modules/tls/doc/certs_howto.xml Modified: modules/tls/tls_server.c Modified: modules/uac/uac_reg.c Modified: modules/usrloc/doc/usrloc_admin.xml Modified: modules/usrloc/ucontact.c Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h Modified: modules/usrloc/urecord.c Modified: modules/xhttp/api.h Modified: modules/xhttp/xhttp_mod.c Modified: modules/xhttp/xhttp_trans.c Modified: modules/xhttp/xhttp_trans.h Modified: modules/xhttp_rpc/xhttp_rpc.c Modified: modules/xhttp_rpc/xhttp_rpc.h Modified: modules/xhttp_rpc/xhttp_rpc_fnc.c Modified: modules/xhttp_rpc/xhttp_rpc_fnc.h Modified: modules/xmlrpc/doc/xmlrpc.xml Modified: modules/xmlrpc/examples/xmlrpc_test2.py Modified: modules/xmlrpc/http.c Modified: modules/xmlrpc/http.h Modified: modules/xmlrpc/xmlrpc.c Modified: modules/xmlrpc/xmlrpc.h Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: tcp_main.c Modified: test/acc-test.cfg Modified: test/auto.c Modified: test/basex.c Modified: test/bit_scan_test.c Modified: test/dns_query.c Modified: test/echo.cfg Modified: test/endian_test.c Modified: test/flood.cfg Modified: test/gen.cfg Modified: test/gethostbyaddr.c Modified: test/gethostbyname.c Modified: test/ifls.c Modified: test/lock_test.c Modified: test/nc.cfg Modified: test/profile.h Modified: test/re_test.c Modified: test/resolver_test.c Modified: test/sf.cfg Modified: test/sock_conn.c Modified: test/sock_disc.c Modified: test/stateless.cfg Modified: test/stress.cfg Modified: test/struas.cfg Modified: test/tcp.cfg Modified: test/tcp_tunnel1.cfg Modified: test/tcp_tunnel2.cfg Modified: test/test.c Modified: test/test.cfg Modified: test/th-uri-2.cfg Modified: test/th-uri-8.cfg Modified: test/th-uri-fast.cfg Modified: test/tx.cfg Modified: test/udp.c Modified: test/udp_flood_disc.c Modified: test/udp_test_proxy.c Modified: test/use_jab.cfg Modified: test/via_parse.c Modified: test/xx.cfg Modified: test/xy.cfg Removed: modules/ims_charging/stats.c Removed: modules/ims_charging/stats.h

---

Diff: https://github.com/kamailio/kamailio/commit/dab4692da5b0969f29259ca5476e874e... Patch: https://github.com/kamailio/kamailio/commit/dab4692da5b0969f29259ca5476e874e...