X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=socket_server.c;h=1e6d5da08e80aa223b9e2c062cd0b7ffca205d1e;hp=b67b91fcc1a763fdd4288832017b64a0e91adb32;hb=91601aaa42f63e4ca89295dfbabe46289bd9cf38;hpb=b0bd74e35e935aa976b68c594def4e8d2c22ef95

diff --git a/socket_server.c b/socket_server.c
index b67b91f..1e6d5da 100644
--- a/socket_server.c
+++ b/socket_server.c
@@ -278,7 +278,7 @@ int admin_route(struct admin_queue **responsep)
 			release:
 			unsched_timer(&apppbx->e_callback_timeout);
 			apppbx->e_action = NULL;
-			apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
+			apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0);
 			start_trace(-1,
 				NULL,
 				numberrize_callerinfo(apppbx->e_callerinfo.id, apppbx->e_callerinfo.ntype, options.national, options.international),
@@ -488,7 +488,7 @@ int admin_release(struct admin_queue **responsep, char *message)
 	}
 
 	unsched_timer(&apppbx->e_callback_timeout);
-	apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
+	apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0);
 
 	out:
 	/* attach to response chain */
@@ -538,7 +538,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg)
 /*
  * this function is called for response whenever a call state changes.
  */
-void admin_call_response(int adminid, int message, const char *connected, int cause, int location, int notify)
+void admin_call_response(int adminid, int message, const char *connected, int cause, int location, int notify_progress)
 {
 	struct admin_list	*admin;
 	struct admin_queue	*response, **responsep;	/* response pointer */
@@ -573,7 +573,7 @@ void admin_call_response(int adminid, int message, const char *connected, int ca
 	SCPY(response->am[0].u.call.callerid, connected);
 	response->am[0].u.call.cause = cause;
 	response->am[0].u.call.location = location;
-	response->am[0].u.call.notify = notify;
+	response->am[0].u.call.notify_progress = notify_progress;
 
 	/* attach to response chain */
 	*responsep = response;
@@ -1049,7 +1049,7 @@ int admin_state(struct admin_queue **responsep)
 			response->am[num].u.p.state = ADMIN_STATE_IDLE;
 		}
 		/* isdn */
-		if ((port->p_type&PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1) {
+		if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_DSS1) {
 			response->am[num].u.p.isdn = 1;
 			pdss1 = (class Pdss1 *)port;
 			response->am[num].u.p.isdn_chan = pdss1->p_m_b_channel;
@@ -1123,7 +1123,7 @@ int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int i
 				epoint = find_epoint_id(admin->epointid);
 				if (epoint) {
 					((class DEFAULT_ENDPOINT_APP *)epoint->ep_app)->
-						release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
+						release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0);
 				}
 			}