automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-17 22:04:22 +00:00
parent 1e38d97c40
commit 3e1daa8f94
17 changed files with 5656 additions and 6626 deletions

View File

@@ -1,5 +1,5 @@
#ifndef ISDN_LIB_INTERN
#define ISDN_LIB_INTER
#define ISDN_LIB_INTERN
#include <mISDNuser/mISDNlib.h>
@@ -11,17 +11,13 @@
#include "isdn_lib.h"
#define QI_ELEMENT(a) a.off
#ifndef mISDNUSER_HEAD_SIZE
#ifdef MISDNUSER_JOLLY
#define mISDNUSER_HEAD_SIZE (sizeof(mISDNuser_head_t))
#else
#define mISDNUSER_HEAD_SIZE (sizeof(mISDN_head_t))
#endif
/*#define mISDNUSER_HEAD_SIZE (sizeof(mISDN_head_t))*/
#endif
@@ -37,8 +33,6 @@ struct isdn_msg {
void (*msg_parser)(struct isdn_msg *msgs, msg_t *msg, struct misdn_bchannel *bc, int nt);
msg_t *(*msg_builder)(struct isdn_msg *msgs, struct misdn_bchannel *bc, int nt);
void (*msg_printer)(struct isdn_msg *msgs);
char *info;
} ;
@@ -60,9 +54,16 @@ struct misdn_stack {
int b_stids[MAX_BCHANS + 1];
int ptp;
int l2upcnt;
int l2_id;
int lower_id;
int upper_id;
int blocked;
int l2link;
time_t l2establish;
@@ -70,7 +71,7 @@ struct misdn_stack {
int l1link;
int midev;
enum mode_e {NT_MODE, TE_MODE} mode;
int nt;
int pri;
@@ -78,6 +79,7 @@ struct misdn_stack {
int procids[0x100+1];
msg_queue_t downqueue;
msg_queue_t upqueue;
int busy;
int port;
@@ -96,4 +98,6 @@ struct misdn_stack {
struct misdn_stack* get_stack_by_bc(struct misdn_bchannel *bc);
#endif