From 01c427aa46ffb006e60d112d5536ac76d9e968f0 Mon Sep 17 00:00:00 2001 From: Super User Date: Thu, 24 Apr 2008 19:35:55 +0200 Subject: [PATCH] work modified: chan_lcr.c modified: mISDN.cpp modified: main.c --- chan_lcr.c | 1 + mISDN.cpp | 2 +- main.c | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/chan_lcr.c b/chan_lcr.c index 3f6c29d..0234e4c 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -27,6 +27,7 @@ From that point on, the ref is not valid, so no other message may be sent with that reference. */ +bchannel-handling muss noch #include #include diff --git a/mISDN.cpp b/mISDN.cpp index bfac919..cdfac9d 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -3789,7 +3789,7 @@ void PmISDN::txfromup(unsigned char *data, int length) frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN; frm->dinfo = 0; frm->len = ISDN_LOAD; - memset(buf+MISDN_HEADER_LEN, (options.law=='a')?0x2a:0xff, ISDN_LOAD); + memset(buf+mISDN_HEADER_LEN, (options.law=='a')?0x2a:0xff, ISDN_LOAD); mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+ISDN_LOAD, TIMEOUT_1SEC); #endif p_m_load += ISDN_LOAD; diff --git a/main.c b/main.c index 8fe35a7..12ed45e 100644 --- a/main.c +++ b/main.c @@ -38,9 +38,9 @@ struct lcr_fdset lcr_fdset[FD_SETSIZE]; #endif pthread_mutex_t mutexd; // debug output mutex -//pthread_mutex_t mutext; // trace output mutex +pthread_mutex_t mutext; // trace output mutex pthread_mutex_t mutexe; // error output mutex -pthread_mutex_t mutex_lcr; // lcr process mutex +//pthread_mutex_t mutex_lcr; // lcr process mutex int memuse = 0; int mmemuse = 0; @@ -217,7 +217,7 @@ int main(int argc, char *argv[]) #endif /* lock LCR process */ - pthread_mutex_lock(&mutex_lcr); +// pthread_mutex_lock(&mutex_lcr); /* current time */ GET_NOW(); @@ -648,9 +648,9 @@ BUDETECT /* did we do nothing? so we wait to give time to other processes */ if (all_idle) { - pthread_mutex_unlock(&mutex_lcr); // unlock LCR +// pthread_mutex_unlock(&mutex_lcr); // unlock LCR debug_usleep(4000, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec); - pthread_mutex_lock(&mutex_lcr); // lock LCR +// pthread_mutex_lock(&mutex_lcr); // lock LCR idletime += 4000; } } @@ -778,7 +778,7 @@ free: MEMCHECK("file handler(s) left",fhuse) /* unlock LCR process */ - pthread_mutex_unlock(&mutex_lcr); +// pthread_mutex_unlock(&mutex_lcr); /* take me out */ return(ret); -- 2.13.6