chan_lcr.c compiles now, and the Makefile generates a .so instead of an executable.

[lcr.git] / apppbx.cpp

diff --git a/apppbx.cpp b/apppbx.cpp
index bf89388..3788c85 100644 (file)
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -678,9 +678,9 @@ foundif:
        }
 
        /* see if link is up on PTP*/
-       if (mISDNport->ptp && !mISDNport->l2link)
+       if (mISDNport->l2hold && !mISDNport->l2link)
        {
-               trace_header("CHANNEL SELECTION (port is ptp with layer 2 down, skipping)", DIRECTION_NONE);
+               trace_header("CHANNEL SELECTION (port holds layer 2, but layer 2 is down, skipping)", DIRECTION_NONE);
                add_trace("port", NULL, "%d", ifport->portnum);
                add_trace("position", NULL, "%d", index);
                end_trace();
@@ -3881,12 +3881,12 @@ void EndpointAppPBX::join_join(void)
        {
                if (other_relation->epoint_id == other_eapp->ea_endpoint->ep_serial)
                {
-               /* detach other endpoint on hold */
+                       /* detach other endpoint on hold */
                        *other_relation_pointer = other_relation->next;
                        FREE(other_relation, sizeof(struct join_relation));
                        cmemuse--;
                        other_relation = *other_relation_pointer;
-                       other_eapp->ea_endpoint->ep_join_id = NULL;
+                       other_eapp->ea_endpoint->ep_join_id = 0;
                        continue;
                }