projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed several compiler warnings
[lcr.git]
/
dss1.cpp
diff --git
a/dss1.cpp
b/dss1.cpp
index
fe4188a
..
4f3d000
100644
(file)
--- a/
dss1.cpp
+++ b/
dss1.cpp
@@
-1685,7
+1685,7
@@
void Pdss1::facility_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_FACILITY);
message->param.facilityinfo.len = fac_len;
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_FACILITY);
message->param.facilityinfo.len = fac_len;
- memcpy(message->param.facilityinfo.data, fac_ie, fac_len);
+ memcpy(message->param.facilityinfo.data, fac_ie
+ 1
, fac_len);
message_put(message);
}
message_put(message);
}
@@
-2327,17
+2327,17
@@
void Pdss1::message_3pty(unsigned int epoint_id, int message_id, union parameter
if (param->threepty.result) {
fac.comp = CompReturnResult;
fac.u.retResult.invokeId = param->threepty.invoke_id;
if (param->threepty.result) {
fac.comp = CompReturnResult;
fac.u.retResult.invokeId = param->threepty.invoke_id;
+ fac.u.retResult.operationValuePresent = 1;
+ if (param->threepty.begin)
+ fac.u.retResult.operationValue = Fac_Begin3PTY;
+ if (param->threepty.end)
+ fac.u.retResult.operationValue = Fac_End3PTY;
}
if (param->threepty.error) {
fac.comp = CompReturnError;
fac.u.retError.invokeId = param->threepty.invoke_id;
fac.u.retError.errorValue = FacError_Gen_InvalidCallState;
}
}
if (param->threepty.error) {
fac.comp = CompReturnError;
fac.u.retError.invokeId = param->threepty.invoke_id;
fac.u.retError.errorValue = FacError_Gen_InvalidCallState;
}
- fac.u.retResult.operationValuePresent = 1;
- if (param->threepty.begin)
- fac.u.retResult.operationValue = Fac_Begin3PTY;
- if (param->threepty.end)
- fac.u.retResult.operationValue = Fac_End3PTY;
encodeFac(fac_ie, &fac);
/* sending facility */
encodeFac(fac_ie, &fac);
/* sending facility */
@@
-2533,7
+2533,6
@@
void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame
{
l3_msg *l3m;
int type, plan, present, screen;
{
l3_msg *l3m;
int type, plan, present, screen;
- class Endpoint *epoint;
time_t current_time;
/* NT-MODE in setup state we must send PROCEEDING first */
time_t current_time;
/* NT-MODE in setup state we must send PROCEEDING first */
@@
-2628,7
+2627,6
@@
void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame
// enc_facility_centrex(&connect->FACILITY, dmsg, (unsigned char *)p_connectinfo.name, 0);
/* date & time */
if (p_m_d_ntmode || p_m_d_tespecial) {
// enc_facility_centrex(&connect->FACILITY, dmsg, (unsigned char *)p_connectinfo.name, 0);
/* date & time */
if (p_m_d_ntmode || p_m_d_tespecial) {
- epoint = find_epoint_id(epoint_id);
time(¤t_time);
enc_ie_date(l3m, current_time, p_settings.no_seconds);
}
time(¤t_time);
enc_ie_date(l3m, current_time, p_settings.no_seconds);
}
@@
-2716,7
+2714,6
@@
if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) {
void Pdss1::message_release(unsigned int epoint_id, int message_id, union parameter *param)
{
l3_msg *l3m;
void Pdss1::message_release(unsigned int epoint_id, int message_id, union parameter *param)
{
l3_msg *l3m;
- class Endpoint *epoint;
char *p = NULL;
/*
char *p = NULL;
/*
@@
-2796,7
+2793,6
@@
wirklich erst proceeding?:
/* send cause */
enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
/* send display */
/* send cause */
enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
/* send display */
- epoint = find_epoint_id(epoint_id);
if (param->disconnectinfo.display[0])
p = param->disconnectinfo.display;
if (p) if (*p && (p_m_d_ntmode || p_m_d_tespecial))
if (param->disconnectinfo.display[0])
p = param->disconnectinfo.display;
if (p) if (*p && (p_m_d_ntmode || p_m_d_tespecial))