[OpenSIPS-Devel] [OpenSIPS/opensips] 524db3: freeswitch ESL connector: First draft

Tue Feb 14 07:51:08 EST 2017

  Branch: refs/heads/master
  Home:   https://github.com/OpenSIPS/opensips
  Commit: 524db38c906ea473f4b09080dd397e3d04b4b97a
      https://github.com/OpenSIPS/opensips/commit/524db38c906ea473f4b09080dd397e3d04b4b97a
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    A modules/freeswitch/Makefile
    A modules/freeswitch/fs_api.h
    A modules/freeswitch/fs_mod.c

  Log Message:
  -----------
  freeswitch ESL connector: First draft

  Commit: 8fe24ec1990a1c468fcf8490228c2fcd42a15121
      https://github.com/OpenSIPS/opensips/commit/8fe24ec1990a1c468fcf8490228c2fcd42a15121
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M Makefile.sources
    M modules/freeswitch/Makefile
    A modules/freeswitch/esl/src/esl.c
    A modules/freeswitch/esl/src/esl_buffer.c
    A modules/freeswitch/esl/src/esl_config.c
    A modules/freeswitch/esl/src/esl_event.c
    A modules/freeswitch/esl/src/esl_json.c
    A modules/freeswitch/esl/src/esl_threadmutex.c
    A modules/freeswitch/esl/src/include/esl.h
    A modules/freeswitch/esl/src/include/esl_buffer.h
    A modules/freeswitch/esl/src/include/esl_config.h
    A modules/freeswitch/esl/src/include/esl_event.h
    A modules/freeswitch/esl/src/include/esl_json.h
    A modules/freeswitch/esl/src/include/esl_oop.h
    A modules/freeswitch/esl/src/include/esl_threadmutex.h

  Log Message:
  -----------
  freeswitch: Integrate FreeSWITCH ESL code

  Commit: 9da8a2532d20f914be0833c6911ac753055de80e
      https://github.com/OpenSIPS/opensips/commit/9da8a2532d20f914be0833c6911ac753055de80e
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    A modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_mod.c

  Log Message:
  -----------
  freeswitch: API draft

  Commit: 54827211e27e55555dd35e72f3fbace1b3e6c2f9
      https://github.com/OpenSIPS/opensips/commit/54827211e27e55555dd35e72f3fbace1b3e6c2f9
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M resolve.c
    M resolve.h

  Log Message:
  -----------
  resolve.c: Add generic "ip[:port]" parsing/resolving

  Commit: 83a164f1a22728de6fc1cd636967576c05393413
      https://github.com/OpenSIPS/opensips/commit/83a164f1a22728de6fc1cd636967576c05393413
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h

  Log Message:
  -----------
  freeswitch: Add box referencing from multiple modules

  Commit: d98b059fab330fad0fe47cff5864df044afc9027
      https://github.com/OpenSIPS/opensips/commit/d98b059fab330fad0fe47cff5864df044afc9027
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    A lib/timerfd.h
    M modules/cfgutils/cfgutils.c

  Log Message:
  -----------
  Move "sys/timerfd.h" conditional import code under lib/

  Commit: e95fc0f5d3e691e8d9e7e1e12026ab686d5de2b8
      https://github.com/OpenSIPS/opensips/commit/e95fc0f5d3e691e8d9e7e1e12026ab686d5de2b8
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_mod.c
    A modules/freeswitch/fs_proc.c
    A modules/freeswitch/fs_proc.h
    M reactor_defs.h

  Log Message:
  -----------
  freeswitch: Add dedicated process for FS conn handling

    * reactor-based waiting on multiple FS boxes
    * periodic TCP reconnect to any box, if needed

  Commit: 549ddcb8058f96aca3d29f90717d075b28c6a744
      https://github.com/OpenSIPS/opensips/commit/549ddcb8058f96aca3d29f90717d075b28c6a744
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M lib/timerfd.h

  Log Message:
  -----------
  lib/timerfd.h: remove unnecessary warning

  Commit: 4dff90f25c93bfbda421563983d791653f6e15ae
      https://github.com/OpenSIPS/opensips/commit/4dff90f25c93bfbda421563983d791653f6e15ae
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    A lib/osips_malloc.c
    A lib/osips_malloc.h

  Log Message:
  -----------
  Add reusable, libc-compatible pkg/shm allocation functions

  Commit: a508d9a0a67caf5d89d252335e0bc36ef19d2756
      https://github.com/OpenSIPS/opensips/commit/a508d9a0a67caf5d89d252335e0bc36ef19d2756
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_mod.c
    M modules/freeswitch/fs_proc.c

  Log Message:
  -----------
  freeswitch: Add heartbeat event parsing & pushing to subscribers

  Commit: f043357c45d3fc296dc69dc19428f2f06a56bcc4
      https://github.com/OpenSIPS/opensips/commit/f043357c45d3fc296dc69dc19428f2f06a56bcc4
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_mod.c
    M modules/freeswitch/fs_proc.c

  Log Message:
  -----------
  freeswitch: Add event socket ref counting and connection cleanup

  Commit: 8662ba31ed0a2544271f55c4a6b84cce23feea31
      https://github.com/OpenSIPS/opensips/commit/8662ba31ed0a2544271f55c4a6b84cce23feea31
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c

  Log Message:
  -----------
  freeswitch: Fix a ref count bug

  Commit: 4cc230efdb0b775f81b751f797285b1973daa6c5
      https://github.com/OpenSIPS/opensips/commit/4cc230efdb0b775f81b751f797285b1973daa6c5
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_mod.c
    M modules/freeswitch/fs_proc.c

  Log Message:
  -----------
  freeswitch: Add rw locking for stat data

  Commit: 1d1e8059f7cf0f28de213e9467244a0e842c6322
      https://github.com/OpenSIPS/opensips/commit/1d1e8059f7cf0f28de213e9467244a0e842c6322
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M db/schema/dispatcher.xml
    M modules/dispatcher/dispatch.c
    M scripts/db_berkeley/opensips/dispatcher
    M scripts/db_berkeley/opensips/version
    M scripts/dbtext/opensips/dispatcher
    M scripts/dbtext/opensips/version
    M scripts/mysql/dispatcher-create.sql
    M scripts/oracle/dispatcher-create.sql
    M scripts/pi_http/dispatcher-mod
    M scripts/pi_http/dispatcher-table
    M scripts/pi_http/pi_framework.xml
    M scripts/postgres/dispatcher-create.sql
    M scripts/sqlite/dispatcher-create.sql

  Log Message:
  -----------
  dispatcher: Update DB schema

Add generic "comm_socket" field - to be used for FreeSWITCH ESL sockets

  Commit: c0a2a68ded44812567d0d754483ed91b8375c019
      https://github.com/OpenSIPS/opensips/commit/c0a2a68ded44812567d0d754483ed91b8375c019
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_mod.c

  Log Message:
  -----------
  freeswitch: Fix a socket matching bug

  Commit: ae8f7d5692a31f35c10a0a3d067d331e16aa557c
      https://github.com/OpenSIPS/opensips/commit/ae8f7d5692a31f35c10a0a3d067d331e16aa557c
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_mod.c

  Log Message:
  -----------
  freeswitch: Add an API loading function

  Commit: fd2fb4b7bde37fc591d1c0e49ed85de2cc4ad984
      https://github.com/OpenSIPS/opensips/commit/fd2fb4b7bde37fc591d1c0e49ed85de2cc4ad984
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/dispatcher/dispatch.c
    M modules/dispatcher/dispatch.h
    M modules/dispatcher/dispatcher.c

  Log Message:
  -----------
  dispatcher: Add FS socket column and import at startup

  Commit: 5f1b8abd376975e5eeced3df14b159d2f02ab475
      https://github.com/OpenSIPS/opensips/commit/5f1b8abd376975e5eeced3df14b159d2f02ab475
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M io_wait_loop.h

  Log Message:
  -----------
  reactor: Improve behaviour when polling on 0 fds

  Commit: 56b488ca83c30cc4dfde2984e4984b503e9c6a31
      https://github.com/OpenSIPS/opensips/commit/56b488ca83c30cc4dfde2984e4984b503e9c6a31
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_proc.c

  Log Message:
  -----------
  freeswitch: Fix some connection closing corner cases

  Commit: 89d73b3b9e37b5dd6bba56dc142e98feea1114c0
      https://github.com/OpenSIPS/opensips/commit/89d73b3b9e37b5dd6bba56dc142e98feea1114c0
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/dispatcher/Makefile
    M modules/dispatcher/dispatch.c
    M modules/dispatcher/dispatch.h
    M modules/dispatcher/dispatcher.c

  Log Message:
  -----------
  dispatcher: Add runtime weight recalculation for FreeSWITCH boxes

  Commit: 8f0ea9663dc0653877fb6ec7c8f656a6fb9290f7
      https://github.com/OpenSIPS/opensips/commit/8f0ea9663dc0653877fb6ec7c8f656a6fb9290f7
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/dispatcher/dispatcher.c

  Log Message:
  -----------
  dispatcher: Improve startup behavior (most common case)

  Commit: 77ba9d958d3fdec4acb44fc262fa7833f95b3f65
      https://github.com/OpenSIPS/opensips/commit/77ba9d958d3fdec4acb44fc262fa7833f95b3f65
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M modules/freeswitch/esl/src/esl.c

  Log Message:
  -----------
  freeswitch: Avoid "missing initializer" gcc error

  Commit: 0d716d9b2f4ea6b377a7ab9fa69e538df2801682
      https://github.com/OpenSIPS/opensips/commit/0d716d9b2f4ea6b377a7ab9fa69e538df2801682
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h

  Log Message:
  -----------
  freeswitch: Add a FS URL parsing function

  Commit: 3522bc7fe52d338789dab79bfbd25de7221e4006
      https://github.com/OpenSIPS/opensips/commit/3522bc7fe52d338789dab79bfbd25de7221e4006
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M modules/load_balancer/lb_data.c
    M modules/load_balancer/lb_data.h
    M modules/load_balancer/lb_parser.c
    M modules/load_balancer/lb_parser.h
    M modules/load_balancer/load_balancer.c

  Log Message:
  -----------
  load_balancer: Add runtime max profile recalculation for FreeSWITCH boxes

  Commit: 87506ce313b375b101c4ed1436911b5929c1f530
      https://github.com/OpenSIPS/opensips/commit/87506ce313b375b101c4ed1436911b5929c1f530
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h

  Log Message:
  -----------
  freeswitch: Provide "is_fs_url" statically

  Commit: f91b2701d7e27c8d4d0db3373303ba5b8b17e589
      https://github.com/OpenSIPS/opensips/commit/f91b2701d7e27c8d4d0db3373303ba5b8b17e589
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_proc.c

  Log Message:
  -----------
  freeswitch: Fix unsafe list iteration

  Commit: 27370bf9e71e54336c7ed0446a5f7dc91ac1a35a
      https://github.com/OpenSIPS/opensips/commit/27370bf9e71e54336c7ed0446a5f7dc91ac1a35a
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
    M modules/load_balancer/lb_parser.c

  Log Message:
  -----------
  load_balancer: Zero resource buffer during parsing

  Commit: a18ee7ca05232c3d771918721b5d8c03d3911755
      https://github.com/OpenSIPS/opensips/commit/a18ee7ca05232c3d771918721b5d8c03d3911755
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
    M modules/load_balancer/lb_parser.c
    M modules/load_balancer/load_balancer.c

  Log Message:
  -----------
  load_balancer: Improve weight recalculation logic

  Commit: cd55c057cb7f722f4d4a40b71e8ef2fcfdc820f4
      https://github.com/OpenSIPS/opensips/commit/cd55c057cb7f722f4d4a40b71e8ef2fcfdc820f4
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

  Changed paths:
    M modules/load_balancer/lb_data.c
    M modules/load_balancer/load_balancer.c

  Log Message:
  -----------
  load_balancer: Refactor modparams

  Commit: 1c7dca5ea07a62487440ae54c99ffa0089f4f0b1
      https://github.com/OpenSIPS/opensips/commit/1c7dca5ea07a62487440ae54c99ffa0089f4f0b1
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

  Changed paths:
    M modules/load_balancer/README
    M modules/load_balancer/doc/load_balancer_admin.xml

  Log Message:
  -----------
  load_balancer: Update doc

  Commit: 23b57309c511580ba36be9eec12db8889ca69b5f
      https://github.com/OpenSIPS/opensips/commit/23b57309c511580ba36be9eec12db8889ca69b5f
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

  Changed paths:
    M modules/dispatcher/dispatch.c
    M modules/dispatcher/dispatch.h
    M modules/dispatcher/dispatcher.c

  Log Message:
  -----------
  dispatcher: Refactor modparam

  Commit: 29bd1beb13e3263ca3657533099ce79e53693eff
      https://github.com/OpenSIPS/opensips/commit/29bd1beb13e3263ca3657533099ce79e53693eff
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

  Changed paths:
    M modules/dispatcher/dispatch.c
    M modules/dispatcher/dispatch.h

  Log Message:
  -----------
  dispatcher: Scale FS weights on a 0 - 100 interval

  Commit: f42bb8eb537d43163c48e217ecc87d0b286a509a
      https://github.com/OpenSIPS/opensips/commit/f42bb8eb537d43163c48e217ecc87d0b286a509a
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

  Changed paths:
    M modules/dispatcher/dispatch.c
    M modules/dispatcher/dispatch.h
    M modules/dispatcher/dispatcher.c

  Log Message:
  -----------
  dispatcher: Add "max_freeswitch_weight" modparam

  Commit: 549bcb6b137d3e8762f72ac158568401f22bde40
      https://github.com/OpenSIPS/opensips/commit/549bcb6b137d3e8762f72ac158568401f22bde40
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

  Changed paths:
    M modules/dispatcher/README
    M modules/dispatcher/doc/dispatcher_admin.xml
    M modules/load_balancer/README
    M modules/load_balancer/doc/load_balancer_admin.xml

  Log Message:
  -----------
  dispatcher/load_balancer: Update doc

  Commit: f9604a76ec411798bfb00a1a495168687d50f303
      https://github.com/OpenSIPS/opensips/commit/f9604a76ec411798bfb00a1a495168687d50f303
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    M db/schema/dispatcher.xml
    M modules/dispatcher/README
    M modules/dispatcher/dispatch.c
    M modules/dispatcher/dispatcher.c
    M modules/dispatcher/doc/dispatcher_admin.xml
    M scripts/db_berkeley/opensips/dispatcher
    M scripts/dbtext/opensips/dispatcher
    M scripts/mysql/dispatcher-create.sql
    M scripts/oracle/dispatcher-create.sql
    M scripts/pi_http/dispatcher-mod
    M scripts/pi_http/dispatcher-table
    M scripts/pi_http/pi_framework.xml
    M scripts/postgres/dispatcher-create.sql
    M scripts/sqlite/dispatcher-create.sql

  Log Message:
  -----------
  dispatcher: Refactor "comm_sock" column

Since it had identical meaning to the "weight" column, it is
better to merge them together into a string column, while retaining
backwards-compatibility with dispatcher table version 7, internally.

  Commit: efe3a56688e0be578b51da88784bcc296b473818
      https://github.com/OpenSIPS/opensips/commit/efe3a56688e0be578b51da88784bcc296b473818
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    M modules/dispatcher/README
    M modules/dispatcher/dispatch.c
    M modules/dispatcher/doc/dispatcher_admin.xml

  Log Message:
  -----------
  dispatcher: Update doc

  Commit: 6c71f42530c5605cb7a04c3bb98d4a6f0688b674
      https://github.com/OpenSIPS/opensips/commit/6c71f42530c5605cb7a04c3bb98d4a6f0688b674
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    M modules/load_balancer/lb_data.c
    M modules/load_balancer/lb_parser.c

  Log Message:
  -----------
  load_balancer: Add some useful startup warnings

FreeSWITCH-enabled destinations should only have one resource,
since it directly correlates with the data derived from its stats.

  Commit: 76ccb9d4157a0803c99eba5015a244117b035e7a
      https://github.com/OpenSIPS/opensips/commit/76ccb9d4157a0803c99eba5015a244117b035e7a
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M modules/freeswitch/fs_api.c
    M modules/freeswitch/fs_api.h
    M modules/freeswitch/fs_proc.c

  Log Message:
  -----------
  freeswitch: Enhance URL definition with "[user]:password" part

  Commit: 2fa3486bfd88837d1f2639e02ae6e290691c79ff
      https://github.com/OpenSIPS/opensips/commit/2fa3486bfd88837d1f2639e02ae6e290691c79ff
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    A modules/freeswitch/README
    A modules/freeswitch/doc/freeswitch.xml
    A modules/freeswitch/doc/freeswitch_admin.xml

  Log Message:
  -----------
  freeswitch driver: Add documentation

  Commit: 60626294bb15941467a1fcfaa1482d234b4786fb
      https://github.com/OpenSIPS/opensips/commit/60626294bb15941467a1fcfaa1482d234b4786fb
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M scripts/opensipsdbctl.mysql

  Log Message:
  -----------
  opensipsdbctl: Fix migration columns for the MySQL "dispatcher" table

  Commit: eae2985abd62d2ae8a6138519cc3634d7bd022ce
      https://github.com/OpenSIPS/opensips/commit/eae2985abd62d2ae8a6138519cc3634d7bd022ce
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M Makefile.sources
    M db/schema/dispatcher.xml
    M io_wait_loop.h
    A lib/osips_malloc.c
    A lib/osips_malloc.h
    A lib/timerfd.h
    M modules/cfgutils/cfgutils.c
    M modules/dispatcher/Makefile
    M modules/dispatcher/README
    M modules/dispatcher/dispatch.c
    M modules/dispatcher/dispatch.h
    M modules/dispatcher/dispatcher.c
    M modules/dispatcher/doc/dispatcher_admin.xml
    A modules/freeswitch/Makefile
    A modules/freeswitch/README
    A modules/freeswitch/doc/freeswitch.xml
    A modules/freeswitch/doc/freeswitch_admin.xml
    A modules/freeswitch/esl/src/esl.c
    A modules/freeswitch/esl/src/esl_buffer.c
    A modules/freeswitch/esl/src/esl_config.c
    A modules/freeswitch/esl/src/esl_event.c
    A modules/freeswitch/esl/src/esl_json.c
    A modules/freeswitch/esl/src/esl_threadmutex.c
    A modules/freeswitch/esl/src/include/esl.h
    A modules/freeswitch/esl/src/include/esl_buffer.h
    A modules/freeswitch/esl/src/include/esl_config.h
    A modules/freeswitch/esl/src/include/esl_event.h
    A modules/freeswitch/esl/src/include/esl_json.h
    A modules/freeswitch/esl/src/include/esl_oop.h
    A modules/freeswitch/esl/src/include/esl_threadmutex.h
    A modules/freeswitch/fs_api.c
    A modules/freeswitch/fs_api.h
    A modules/freeswitch/fs_mod.c
    A modules/freeswitch/fs_proc.c
    A modules/freeswitch/fs_proc.h
    M modules/load_balancer/README
    M modules/load_balancer/doc/load_balancer_admin.xml
    M modules/load_balancer/lb_data.c
    M modules/load_balancer/lb_data.h
    M modules/load_balancer/lb_parser.c
    M modules/load_balancer/lb_parser.h
    M modules/load_balancer/load_balancer.c
    M reactor_defs.h
    M resolve.c
    M resolve.h
    M scripts/db_berkeley/opensips/dispatcher
    M scripts/db_berkeley/opensips/version
    M scripts/dbtext/opensips/dispatcher
    M scripts/dbtext/opensips/version
    M scripts/mysql/dispatcher-create.sql
    M scripts/opensipsdbctl.mysql
    M scripts/oracle/dispatcher-create.sql
    M scripts/pi_http/dispatcher-table
    M scripts/pi_http/pi_framework.xml
    M scripts/postgres/dispatcher-create.sql
    M scripts/sqlite/dispatcher-create.sql

  Log Message:
  -----------
  Merge branch 'feature/FS-load-balancer'

Conflicts:
	reactor_defs.h

Compare: https://github.com/OpenSIPS/opensips/compare/076c78cbf3ac...eae2985abd62