diff --git a/Makefile b/Makefile index e40e094..08f4c1d 100644 --- a/Makefile +++ b/Makefile @@ -295,12 +295,12 @@ clean: rm -f $(LCR) $(LCRADMIN) $(CHAN_LCR) $(LCRWATCH) $(GEN) $(GENW) $(GENRC) $(GENEXT) rm -f *.o rm -f .*.c.sw* .*.cpp.sw* .*.h.sw* - rm -f bla nohup.out + rm -f bla nohup.out a.out rm -f debug*.log tar: make clean - cd .. && tar -cvzf lcr_`date +%Y%m%d`.tar.gz lcr + cd .. && tar --exclude=.git -cvzf lcr_`date +%Y%m%d`.tar.gz lcr start: $(LCR) sync diff --git a/README b/README index f0dd00e..c04658e 100644 --- a/README +++ b/README @@ -413,3 +413,7 @@ Changes in Version 0.3 - Fixed minor audio gain bug. - Moved timeout setting from extension to interface.conf. +Changes in Version 0.3 +- Complete set of EFI samples + + diff --git a/action_efi.cpp b/action_efi.cpp index bd24952..f22cf8a 100644 --- a/action_efi.cpp +++ b/action_efi.cpp @@ -19,6 +19,7 @@ #include "main.h" enum { + EFI_STATE_HELLO, EFI_STATE_DIE, EFI_STATE_BENUTZERDEFINIERTE, EFI_STATE_UNTERDRUECKTE, @@ -55,8 +56,8 @@ void EndpointAppPBX::action_init_efi(void) /* initialize the vbox */ PDEBUG(DEBUG_EPOINT, "EPOINT(%d) initializing efi\n", ea_endpoint->ep_serial); - e_efi_state = EFI_STATE_DIE; - set_tone_efi("die"); + e_efi_state = EFI_STATE_HELLO; + set_tone_efi("hello"); e_efi_digit = 0; } @@ -76,6 +77,10 @@ void EndpointAppPBX::efi_message_eof(void) switch(e_efi_state) { + case EFI_STATE_HELLO: + e_efi_state = EFI_STATE_DIE; + set_tone_efi("die"); + break; case EFI_STATE_DIE: if (e_callerinfo.screen==INFO_SCREEN_USER) { @@ -109,15 +114,16 @@ void EndpointAppPBX::efi_message_eof(void) e_efi_digit++; } else { - e_efi_state = EFI_STATE_STOP; //EFI_STATE_ICH_WIEDERHOLE; - message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_DISCONNECT); - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - message->param.disconnectinfo.cause = CAUSE_NORMAL; - message_put(message); - logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); - new_state(EPOINT_STATE_OUT_DISCONNECT); - set_tone(portlist,"cause_10"); -// set_tone_efi("ich_wiederhole"); +// e_efi_state = EFI_STATE_STOP; + e_efi_state = EFI_STATE_ICH_WIEDERHOLE; +// message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_DISCONNECT); +// message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; +// message->param.disconnectinfo.cause = CAUSE_NORMAL; +// message_put(message); +// logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); +// new_state(EPOINT_STATE_OUT_DISCONNECT); +// set_tone(portlist,"cause_10"); + set_tone_efi("ich_wiederhole"); } break; diff --git a/main.h b/main.h index 3e8ec33..0eac1ab 100644 --- a/main.h +++ b/main.h @@ -13,7 +13,7 @@ #define DEFAULT_ENDPOINT_APP EndpointAppPBX -#define VERSION_STRING "0.3 (December 2007)" +#define VERSION_STRING "0.4 (Spring 2007)" extern int memuse; extern int mmemuse; diff --git a/tones_efi/benutzerdefinierte.isdn b/tones_efi/benutzerdefinierte.isdn new file mode 100644 index 0000000..3e9d6aa Binary files /dev/null and b/tones_efi/benutzerdefinierte.isdn differ diff --git a/tones_efi/die.isdn b/tones_efi/die.isdn index c354001..fafa471 100644 Binary files a/tones_efi/die.isdn and b/tones_efi/die.isdn differ diff --git a/tones_efi/hello.isdn b/tones_efi/hello.isdn new file mode 100644 index 0000000..c354001 --- /dev/null +++ b/tones_efi/hello.isdn @@ -0,0 +1,15 @@ +********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************KKKKKK***KKKK*j***+***+********jjj*KKK**+*******+J*JJJJ****+*j K++Z'gF~~!ۈFiJ(aO.GFV69KOg6 V9J8s* V&(O9)a(Fo7'j` Z '9HHa78KZqr*j /!sG غimYF s)/9K`3.')8 .~KsXlȎaq )I*YAoO9iAiN7FW&FG)X`6VZ) ˰ƁY3Yh6&(F;NW9&g@'9 A&&XLjg7~AIghGg!~p/@ƉW7cF`a'X6'gF) aGNF1Oa؈V9 A&NA*&iڸFKZJX9r( Y)!roi~ar./K*).'*yG9&ؘqi0VV'Ƙhy!)憰&aiWN.V/G'&8(a)Yh3h/8N Wƈ&7i)VhVXW!NV8G/V*NG*~~N O~!Y aGVH~WV76'8 cۗ9J r)h7i38n7?^8iVgij`F )X7g(6  Osp9ga)o'8 9VaOOFRrah)ƸXX'هFh/*X7w`v7V&&(6VWA!'*VNy) .Hx)!q*x ~qIFKhGI[jX[Y V yH~kqJ..OV9o'FXioZ(SI'X~FX/6&aW:6A8X7X a.i:NO7h.H9g3F. YXІ)*O* ڈ@V6gVo ٙGosW!~rXo~cqyJȖNNYFK'ؘh~Wi) G'89/W9Hw('!Y&0i s` ZV6ISy*X63sY 8iJJ*Hg/ذy*GY'96Vq'i/O'VyY&`*i&W87WNǗO jV-&6`h)g9 @Z( F)Nh&o/g7釙9VNa)V/o&K9qYX ǹ&G j)Aa@onIVY~؀n!i9~ȸ) V9˙Z8i99'~1!N(V9VF9)ha#+g&H~q*g1N9ǗoXhH a N vFW1!H)cFNO8VNYq/@Vyyธ'ٹπfZFɋ:)!!J~hrVFi!99H)G~g609))H(* HV'ySr,hsFX`n1ODZV3W`AqᆈȈȇgqaF`i~.f  H&i)&hi3X8XA˸8&bW.'a p~)y &)9aAW p`Z^)Zy X) FX)YY H(y)33ˆ&g)1Y0иg6 O'X9726 (鉖GV 0y!rFO&6(i8ȈiYYXH~yѱO*/7?0)h)h0 K1opЖ737I,N9ف& +GCilG 9Wv(/(+!a7ИcGg9C/YI~+Npya3VI.H@.qȸָ~ g.!V@X7AqIn6hamF8FADZwX`(~aq0bshqg 6Whr9X(`o)VVAW!q`(9Wj9H, 9wi/*!'@0Hǁ 7/FpI 998Y&'qh?0q9fX؀9f VpϱmXֆX#fhז&/qNr7 SNa196)9('aƀ@O1ؘNyg99Opl(W OX XyvY&/ ,ƁG!' (yI.G&g90a h23XNXHIف8`VA' *f(7 @HRj yhAW 'aI7SXFg9y)y on(Xqa`عOn)nIـ )9) @gٗi#8c&6O@9ٙ/0؇3R;~s ~R>V?fX!a^X)φ!hfx΁F&&V(y֘66F.GqظK)ayvG'6nFoF6kgsn!g `Fcy~†~wIw9)/N_(`6ɇ`ZONF/h!W'~h/!aiZO)N~ii>N(K6y Y "66XX!y6~f( .VVnHhG'Hf)Y~vh/)OW68rJ&Vؖ7WG .ظ&97:gV)_ NV iW7&i)))9Vo2NYa ivFWWK {nNIa9Wg`39Obv`(9 )i" 6yi&f@h'9G.&. K>I)V V(& y/`wi VFFY)o`{'?ف98Hə&h7Gac&~V8:'7YI/r9)" Z7) HV˺Yy[' +NؘG9YI "N iXVV(hƈr9ɏof +I9F3h.Iy/((~#>ɁRhV8'g)b(Hfy&VO 6V.k&(GOV 9nI9>.>>*&7bƸ!gn8V 9YG& )VV/K![(i g'`FWI7& 'yw'yvFB(nY)@ ) o?s~7Ya36{y n)bKVHٗWpF~87~0g Yqp)NفO) !@Ѐiy)yi)yN9`l'V Y- a@`p~O91G*l7Wi9& X/&hy !!)V@I.VHaa9aHliINnVZcI V@`YVZ,n6˱Y(cYXIFry9FhJ!XWAab`jV gW>KaNc./ya&F!IV`ac*1G*XƁqG6@)XF`W'io@Wv7HX F`W9HV.I1!Ⱥ8ڬ W19Wg~AN()FN / ~O ha9 +'WqSZ'Vi 9FGooi2YWI@y)hiXA7OGrV0 yWy)igǙa' G!V6hi- 78&syW8oN@h*` +'h(j9g.aVp_((!@hpN +iX!F1:li*Z!)VAYhH!v șhl9gI7`92 +9ۙ0VCA(a hiVX) Vo^@a^?٭FNɁVyFVV0>Aج68 )@ 9'hHvyIq1wp,NHmb``G9a l~7yX!V@a)N hy'WlGG!NI `~3I869qh Z/@iYg و; 66Fys(9.!AN:p: F8.iY193J3WFI9/A1Xo!YÂV@VI1 X).iw7y7~9gg .(GI9^ v2W?gV~qwGp?O'X!yiNqygi~Ov qJv0g9V!iCH8mwX*i.hO၉va9S(F>蘈&3N)fgpf~Iq)RV>'Ap yGɁ(GaX9YV/8,.k.f9WُRY9[ V)~;G8`8~((8*!Yn (Hy+Iw膈39qhN^Oih)y_p3aq)hƉF+V')qw y .`ۋA0Wo&YIn9I !OXky9O8 OR& O g+VyaS)+`ñFo)ٞ6hinYR3X~`_:Gy!x@JY9ni.f*1h9W)9 vFa9)h./ +czGq ȉi^Kjc`VGcGXO )3Gon7ؖNygOۿN Y)h yA)v 69&JfwyyvV)ff)(&!2h+y 7VNO_V~hGZ(Hvy&'6yS`n7NXF*)/ 8?/7g(36W**ag NKsI'F?!9ZV*iGJh#ٙFgXa0N&Y)GG&ig&9)V28Vn'a)@o')Vx/Wɸ( && H&ۉwayhN&AoK!I~ko)HX89y(F7i@ȉ!A+(['(IZƙg^W8hAǸH( Os&9s~`cKk Vh2! X8Vg .IVJgNXǙy36X37yiJ!~i/Z6ywFX&!Z K*9+XGYRV" 7.!JXVyA38+:Vs!wH(iy6/c&VoA.X~9 )'H&FY.NFroyy(hS'Y/F())!)Nx.R7'[{o8`FY w&6.V))9ȸ 6)i/V3J a)O. w+g *I n6h8"G.*7G)iZ.ظgIoGV.F.J)'ۖV7)GN6V7 /rȈ.Ǘy(n# 'c.h62*I97&gGɟHVc)&FN&/ 2X6N) )J~.6膻Gy[86.K3Go'Ooɹ6.ZZwO/7gڃFrb6&Grs'i7..&VV g(N/ I7~~7WG3KF&67(Fgin7)c&Ny6&//~~yON6~Y&~.s&VoIF3)~&)/6ۺ' >F&++ 7gsJ7)(Zic Vcc og.XKgw*sho9*G~ ~7Z) F/VW 9')nNOق+*V*G*Gy7+VhHI!g3h*(/Wa36/7*)O&.K)KKF)G'闘*&7)GV"WvG&vVc6.''W(NK9GVO–. 'Yظ.gJjN7gX7/Y3F.W6WHVF9O)g(V&Zh)3O&Z'ii VgOHIZ9*JYi'KZ~Gr''yVVO9Z)&y7WGFk*V(6))&jJ'N!iJ`GJ'Y'V(Z&'IgɇON'6)~済W)*i&Vv7i/.Lj +6V~hsaWG&N36)vh)7O&.I~nh*y97(OY9iFGicy8SGV6NgrV)I7/8.N2IO*V NVfJ7 9HF[/&gW~O (؊/ FV/iO& ')+2+7ov9WV3 .c3 //`{)Y~bNVViW79k2'.VWy*hSgۆh)ar*S gV.G&oƖVJy.Vv&~oo3H K &ǏfFwr86/7Oϟښ'G'FXO ȸ7/>zGXVo iN*h(Oi)g~g)gos*36H9yn(gc))&I OZ*N.99g~V6~3gJgVV6r7y6V:2iy7H s6'F&gƘ3G_3~*7G[wI9GF( O/7)&OWgrr*F)))&HȆ''o/sj(HGg#rvVZ3Z.'i)oƈ~73cʂN&Vy~V~77")gfh&y/~+J)9HVƏI/NZK~~6*9((V/g~(VNʗyV&* +G)gH;G7Nc.6.'&VOoOsOO.7)s3s2~~oW')g +c*~O))fsZ7'6HJ)9W*2/[&g)WږV(G3n23zkNv)gN.g'&Nc **O77Vo'.Oo~F 7*O'G/6H6O)sFKcN.&~7/Vh(gO:/c˖hwWcVOJO'NVF3ig.rc&7˞6Ȇ'_ 3nJ fbwiOcj./+7O+/.JGffVNSg3'Vb*iI*2/OrsggF/W7[r**&coWjVgZ**On~.h&2s'Ks&gG.K~S/V/GO.rF6n'o~&*[OOV'g: jƎ3i)J~hcGo'+F&G7g*v&OO.*/ON6rO g.*rwWNV&&/c:/.f&'G)&Jo/cG/.F*3)gKc.F/c/GosF./s'*Ks~/GZ.rj*~ Sg'V.3ggc3N2JLJ*6~/K3/KZ3ggOJrcj/go.oO.N*ʇoJ~N/'3*NgcN/KGcZNO/Z's&r*K'/~j3wcN3*oO&'***rNZ3cOWg&KO7*J&&:cggg3NcsoOJNJos7/.&JJ.Oos/6/'g{~ڎ.›g3OOK*'.N.&''cssR&.RJZ&~O/oOB~.ZWG.N&./[c*~&)2r.Z*c77/N~37o:"NZZZc)gG*K/.&~JK~.NNs/S6roG/NN'OOZf2*O'3K+6'O~*.N*g7'oGO3oZ~6NK.F~/3O*&)'JN*/*G&67*rJ2.g./oOKN..ˇ'*Z.&~c//'GN.*O N~JsGON~JJKs/'N./gGO.&. .~3.VV./g/*j/K~NGGn./OcJVN/G'/ZZZS33F~/ +rJb&b'GgsJ~cs/ON&JڂNrǗgFNg'sJ/&~rs)Gr&N*S//O~cK3O7G6&O'O.ۃێ./GJƖsKs3sZ6O.Z*N+gOK.Fr//crZ&*G**ZNˋc+oOZrGW.K*O7W/&&'g2~sK.r/r~jjcO.Sg.~JgGsNJ*J+GccsG'ZJ*/rڻ''FZZj3oSN3/ZrKO'چ//K*OcJ/FFN/WF.*ooN'*N.GGK./&*N&*/J3/*.NWo.&Zs**nN&O2*ZJJr˺'OK*.:JrK/*OG/NFO/''*+~*sV~Oo*:g~66GLJr.jcgo(&gǏ**../N&JgZƞ33 cc.FNoGo:&3[+'KJ.&G**.rZ7gK~Nr.o/K: ''~~3sN~Z˂J*gR6KO+/~~rK7ۆ6~/sZڏgSN6ꏇGZ&SJK'F6.sO3ZJcZ/.&*ocj/3K.K'gKnrKcg'/+Og/*c*ZN~g.~Sc'K.&NGOr~b***.''&~/g*c/../77/NNZ*3oJZ/.& OG'N*J+K*/&*ۏO3Z*Z./OOC.*s33cNNsOo*ۂN''/rZKcK~fG'3ZN.Z+N;gGOJڂb*JZ {gZJKˢڂN.go.N/3j/OKNr/rZ**/NN#S*Jc3Z>[s'3N.*KcoO/rJsOO/.*+/K~N3j*cZ&O''/N.JcsssKN/3Kr.K*rO&c##JJ.cc:rc+3O/*r.../[ZKog..c/c/3JJg.r+*K/o.*sr*Z*O'&j3sKs*~rK/O'O*NN;*sۃcsrJ/o/scJN~s3ڎ/O*.zkK3.N.ocjZ_Orr..3sO3:r2**bJK*so...*oOZJ*ZZjs'.rO/*..J/O.*3cۃ3.˛/sJJr+/s3S3*NZ*o/+*JNJۏ/csۂrZ3O3cZ.~OccK:Z*JrOs*r~K3**/**..*/r.Jc/:sOo K:**꺃3*r.rۏs*r*c/J.[/cj*//*c3/s*.2++*sKKs.Kc3Kº*3KNcsJ*c3cڎrJ3c*J*2+s/*:ۃcK.33sۂr*sKK+J..+ ss3/K**:Ko3J/3KKKK*r***[/rJڂc3ZBB*3cjJcK*ssr +*3ooKr**J/Or+*/O˺*KBjKs/3.J:jc*JKJ*K*[/J3KKr**c3cZ*JZ33˃*ںjj/3K**JrJKK*KJJjۏSj*K3cK*JZo/*/**K3J*Jr/OjJK꺃/ZںºsojJ*J*/s*JJ*KꃻJ+*c**ˋ{Z.ZKjۃKZ3c3b**JKK*r.+Ã{**Z:3##*./ **K.s3*.J[K* ˂rڻ/sK*ZjjZcc{jZsKK++K***JJ**K*Z"**3*K*ZsJ˺**+*3/[ʂJK*KK*ccc3ZjK*ZKK3***Kڂccc*rK**K*K* Jj **cK*b**[+***JJ*s3***JJ***cKJZJ3c**:+s3*Z+s*J*[+JJJs/Z*KK3s3ZJ***KÃZJKJ* J*Kۃ*J*** ˺Z*KKK*JJKKK*J**KK*ZJ3cK*JJ**ۃ3*j**J*s**ۃK*** j:33*jJ*J˃****+**ˊ++*KKJ*j˃:jjK*ZZ*K**K**J*KKK+ZK*KKK**K**K*JK********K[K**JJ****cK****J*******˃*+*K*:j *K****K*J*KKK**KK**J*+ۛ **꺺K **KjKK**ʻKK**+*K***Kjjj*K*jj**K**+***K*****+++K*jj**ˋ ****KK*+**J***KK***********K*jj*******K*K***KK***jj*K***k**Kj*+******K****K**jj KK*jK+****K;+****K;+******KK**jj*++*j**Kj****K+kk+*+**+******jKj*++jjjj+j++k++jjjjjjjjjjjj+jkk++jj*jjjj+*+k++jjj*+++j+jjj+j**+++k++jj +jjjj*j+++ ++++k+k+kkjjj+jk+++ +*+j +jj++jj+++닋+kjjjjjjjjj+++**+jjjj++jjj+++++++++*jjjjj+++++jjjjk+k+j+j+j+ \ No newline at end of file diff --git a/tones_efi/ich_wiederhole.isdn b/tones_efi/ich_wiederhole.isdn new file mode 100644 index 0000000..01f61a4 Binary files /dev/null and b/tones_efi/ich_wiederhole.isdn differ diff --git a/tones_efi/rufnummer_lautet.isdn b/tones_efi/rufnummer_lautet.isdn new file mode 100644 index 0000000..cd52c1e Binary files /dev/null and b/tones_efi/rufnummer_lautet.isdn differ diff --git a/tones_efi/unterdrueckte.isdn b/tones_efi/unterdrueckte.isdn new file mode 100644 index 0000000..33a41d6 Binary files /dev/null and b/tones_efi/unterdrueckte.isdn differ