dos2unix

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5216 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/iax/src/iax.c b/libs/iax/src/iax.c
index 19004b05a4df9dcbcf2b979771dfd0d0a4f33575..c60aa2bad88feda43e9d3d9e611e455454682707 100644 (file)
--- a/libs/iax/src/iax.c
+++ b/libs/iax/src/iax.c
@@ -140,7 +140,7 @@ static int netfd = -1;
 /* Max timeouts */
 static int maxretries = 10;
 
-/* configurable jitterbuffer options */\r
+/* configurable jitterbuffer options */
 static long jb_target_extra = -1; 
 
 static int do_shutdown = 0;
@@ -948,11 +948,11 @@ int iax_shutdown(void)
        return do_shutdown++;
 }
 
-void iax_set_jb_target_extra( long value )\r
-{\r
-       /* store in jb_target_extra, a static global */\r
-       jb_target_extra = value ;\r
-}\r
+void iax_set_jb_target_extra( long value )
+{
+       /* store in jb_target_extra, a static global */
+       jb_target_extra = value ;
+}
 
 int iax_init(char *ip, int preferredportno)
 {
@@ -979,33 +979,33 @@ int iax_init(char *ip, int preferredportno)
                    return -1;
            }
            
-           if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO;\r
-               if (preferredportno < 0)  preferredportno = 0;\r
-\r
-               sin.sin_family = AF_INET;\r
-               sin.sin_addr.s_addr = 0;\r
-               sin.sin_port = htons((short)preferredportno);\r
-               if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) \r
-               {\r
-#if defined(WIN32)  ||  defined(_WIN32_WCE)\r
-                       if (WSAGetLastError() == WSAEADDRINUSE)\r
-#else\r
-                       if (errno == EADDRINUSE)\r
-#endif\r
-                       {\r
-                               /*the port is already in use, so bind to a free port chosen by the IP stack*/\r
-                               DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one");\r
-                               sin.sin_port = htons((short)0);\r
-                               if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0)\r
-                               {\r
-                                       IAXERROR "Unable to bind UDP socket\n");\r
-                                       return -1;\r
-                               }\r
-                       } else\r
-                       {\r
-                               IAXERROR "Unable to bind UDP socket\n");\r
-                               return -1;\r
-                       }\r
+           if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO;
+               if (preferredportno < 0)  preferredportno = 0;
+
+               sin.sin_family = AF_INET;
+               sin.sin_addr.s_addr = 0;
+               sin.sin_port = htons((short)preferredportno);
+               if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) 
+               {
+#if defined(WIN32)  ||  defined(_WIN32_WCE)
+                       if (WSAGetLastError() == WSAEADDRINUSE)
+#else
+                       if (errno == EADDRINUSE)
+#endif
+                       {
+                               /*the port is already in use, so bind to a free port chosen by the IP stack*/
+                               DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one");
+                               sin.sin_port = htons((short)0);
+                               if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0)
+                               {
+                                       IAXERROR "Unable to bind UDP socket\n");
+                                       return -1;
+                               }
+                       } else
+                       {
+                               IAXERROR "Unable to bind UDP socket\n");
+                               return -1;
+                       }
                }
                sinlen = sizeof(sin);
            if (getsockname(netfd, (struct sockaddr *) &sin, &sinlen) < 0) {
@@ -1587,12 +1587,12 @@ static struct iax_event *handle_event(struct iax_event *event)
                                iax_send_pong(event->session, event->ts);
                                iax_event_free(event);
                                break;
-                       case IAX_EVENT_POKE:\r
-                               event->etype = IAX_EVENT_PONG;\r
-                               iax_send_pong(event->session, event->ts);\r
-                               iax_destroy(event->session);\r
-                               iax_event_free(event);\r
-                               break;         \r
+                       case IAX_EVENT_POKE:
+                               event->etype = IAX_EVENT_PONG;
+                               iax_send_pong(event->session, event->ts);
+                               iax_destroy(event->session);
+                               iax_event_free(event);
+                               break;         
                        default:
                                return event;
                        }
@@ -2702,9 +2702,9 @@ static struct iax_event *iax_header_to_event(struct iax_session *session,
                                e->ts = ts;
                                e = schedule_delivery(e, ts, updatehistory);
                                break;
-                       case IAX_COMMAND_POKE:\r
-                               e->etype = IAX_EVENT_POKE;\r
-                               e->ts = ts;\r
+                       case IAX_COMMAND_POKE:
+                               e->etype = IAX_EVENT_POKE;
+                               e->ts = ts;
                                break;
                        case IAX_COMMAND_PING:
                                /* PINGS and PONGS don't get scheduled; */