name first then number if it's blank

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@663 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/src/ozmod/ozmod_libpri/ozmod_libpri.c b/libs/freetdm/src/ozmod/ozmod_libpri/ozmod_libpri.c
index 3dc0c88ad48371dc92e7156b073b273b3a19ded7..317e0d8ad117995ca5779acd2250a689d919fe69 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_libpri/ozmod_libpri.c
+++ b/libs/freetdm/src/ozmod/ozmod_libpri/ozmod_libpri.c
@@ -607,7 +607,11 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
        memset(&zchan->caller_data, 0, sizeof(zchan->caller_data));
        
        zap_set_string(zchan->caller_data.cid_num.digits, (char *)pevent->ring.callingnum);
-       zap_set_string(zchan->caller_data.cid_name, (char *)pevent->ring.callingnum);
+       if (!zap_strlen_zero((char *)pevent->ring.callingname)) {
+               zap_set_string(zchan->caller_data.cid_name, (char *)pevent->ring.callingname);
+       } else {
+               zap_set_string(zchan->caller_data.cid_name, (char *)pevent->ring.callingnum);
+       }
        zap_set_string(zchan->caller_data.ani.digits, (char *)pevent->ring.callingani);
        zap_set_string(zchan->caller_data.dnis.digits, (char *)pevent->ring.callednum);