Corrected error print, if mISDN_dsp.ko module cannot be loaded.

	modified:   README
	modified:   bchannel.c
	modified:   mISDN.cpp
	modified:   main.c

diff --git a/README b/README
index c6d32f2..ef5d669 100644 (file)
--- a/README
+++ b/README
@@ -445,4 +445,5 @@ Changes in Version 1.1
 - Ports can now be given with number or with name.
 
 Fixes in current Version
 - Ports can now be given with number or with name.
 
 Fixes in current Version

+- Changed isdninfo to misdn_info.

 
 

diff --git a/bchannel.c b/bchannel.c
index 3625eba..c25d770 100644 (file)
--- a/bchannel.c
+++ b/bchannel.c
@@ -148,7 +148,7 @@ int bchannel_create(struct bchannel *bchannel, int mode)
        }
        if (bchannel->b_sock < 0)
        {
        }
        if (bchannel->b_sock < 0)
        {

-               CERROR(bchannel->call, NULL, "Failed to open bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", bchannel->handle);
+               CERROR(bchannel->call, NULL, "Failed to open bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDN_dsp.ko?\n", bchannel->handle);

                return(0);
        }
        
                return(0);
        }
        


@@ -169,7 +169,7 @@ int bchannel_create(struct bchannel *bchannel, int mode)
        ret = bind(bchannel->b_sock, (struct sockaddr *)&addr, sizeof(addr));
        if (ret < 0)
        {
        ret = bind(bchannel->b_sock, (struct sockaddr *)&addr, sizeof(addr));
        if (ret < 0)
        {

-               CERROR(bchannel->call, NULL, "Failed to bind bchannel-socket for handle 0x%x with mISDN-DSP layer. (port %d, channel %d) Did you load mISDNdsp.ko?\n", bchannel->handle, addr.dev, addr.channel);
+               CERROR(bchannel->call, NULL, "Failed to bind bchannel-socket for handle 0x%x with mISDN-DSP layer. (port %d, channel %d) Did you load mISDN_dsp.ko?\n", bchannel->handle, addr.dev, addr.channel);

                close(bchannel->b_sock);
                bchannel->b_sock = -1;
                return(0);
                close(bchannel->b_sock);
                bchannel->b_sock = -1;
                return(0);

diff --git a/mISDN.cpp b/mISDN.cpp
index 98e2c6c..97f7b3e 100644 (file)
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -385,7 +385,7 @@ static int _bchannel_create(struct mISDNport *mISDNport, int i)
        mISDNport->b_socket[i] = socket(PF_ISDN, SOCK_DGRAM, (mISDNport->b_mode[i]==B_MODE_HDLC)?ISDN_P_B_L2DSPHDLC:ISDN_P_B_L2DSP);
        if (mISDNport->b_socket[i] < 0)
        {
        mISDNport->b_socket[i] = socket(PF_ISDN, SOCK_DGRAM, (mISDNport->b_mode[i]==B_MODE_HDLC)?ISDN_P_B_L2DSPHDLC:ISDN_P_B_L2DSP);
        if (mISDNport->b_socket[i] < 0)
        {

-               PERROR("Error: Failed to open bchannel-socket for index %d with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", i);
+               PERROR("Error: Failed to open bchannel-socket for index %d with mISDN-DSP layer. Did you load mISDN_dsp.ko?\n", i);

                return(0);
        }
        
                return(0);
        }
        


@@ -406,7 +406,7 @@ static int _bchannel_create(struct mISDNport *mISDNport, int i)
        ret = bind(mISDNport->b_socket[i], (struct sockaddr *)&addr, sizeof(addr));
        if (ret < 0)
        {
        ret = bind(mISDNport->b_socket[i], (struct sockaddr *)&addr, sizeof(addr));
        if (ret < 0)
        {

-               PERROR("Error: Failed to bind bchannel-socket for index %d with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", i);
+               PERROR("Error: Failed to bind bchannel-socket for index %d with mISDN-DSP layer. Did you load mISDN_dsp.ko?\n", i);

                close(mISDNport->b_socket[i]);
                mISDNport->b_socket[i] = -1;
                return(0);
                close(mISDNport->b_socket[i]);
                mISDNport->b_socket[i] = -1;
                return(0);


@@ -2160,7 +2160,7 @@ struct mISDNport *mISDNport_open(int port, char *portname, int ptp, int force_nt
                }
                if (port == cnt)
                {
                }
                if (port == cnt)
                {

-                       PERROR_RUNTIME("Port name '%s' no found, use 'isdninfo' tool to list all existing ports.\n", portname);
+                       PERROR_RUNTIME("Port name '%s' no found, use 'misdn_info' tool to list all existing ports.\n", portname);

                        return(NULL);
                }
                // note: 'port' has still the port number
                        return(NULL);
                }
                // note: 'port' has still the port number

diff --git a/main.c b/main.c
index 2335067..1f736fb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -268,8 +268,8 @@ int main(int argc, char *argv[])
        /* query available isdn ports */
        if (!(strcasecmp(argv[1],"query")))
        {
        /* query available isdn ports */
        if (!(strcasecmp(argv[1],"query")))
        {

-               fprintf(stderr, "-> Using 'isdninfo'\n");
-               system("isdninfo");
+               fprintf(stderr, "-> Using 'misdn_info'\n");
+               system("misdn_info");

                ret = 0;
                goto free;
        }
                ret = 0;
                goto free;
        }