Changeset 10227 in ntrip for trunk/BNC/src/upload
- Timestamp:
- Oct 20, 2023, 9:45:38 PM (16 months ago)
- Location:
- trunk/BNC/src/upload
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
r10221 r10227 828 828 || co.NumberOfSat[CLOCKORBIT_SATSBAS] > 0 829 829 || co.NumberOfSat[CLOCKORBIT_SATBDS] > 0) { 830 char obuffer[CLOCKORBIT_BUFFERSIZE] = { 0};830 char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'}; 831 831 int len = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_AUTO, 0, obuffer, sizeof(obuffer)); 832 832 if (len > 0) { … … 840 840 else { 841 841 if (co.NumberOfSat[CLOCKORBIT_SATGPS] > 0) { 842 char obuffer[CLOCKORBIT_BUFFERSIZE] = { 0};842 char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'}; 843 843 if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) { 844 844 co.UpdateInterval = ephUpdInd; 845 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GPSORBIT, 1, obuffer, 846 sizeof(obuffer)); 845 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GPSORBIT, 1, obuffer, sizeof(obuffer)); 847 846 co.UpdateInterval = clkUpdInd; 848 847 if (len1 > 0) { … … 855 854 co.NumberOfSat[CLOCKORBIT_SATSBAS] > 0 || 856 855 co.NumberOfSat[CLOCKORBIT_SATBDS] > 0 ) ? 1 : 0; 857 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GPSCLOCK, mmsg, obuffer, 858 sizeof(obuffer)); 856 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GPSCLOCK, mmsg, obuffer, sizeof(obuffer)); 859 857 if (len2 > 0) { 860 858 hlpBufferCo += QByteArray(obuffer, len2); … … 865 863 if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) { 866 864 co.UpdateInterval = ephUpdInd; 867 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GLONASSORBIT, 1, obuffer, 868 sizeof(obuffer)); 865 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GLONASSORBIT, 1, obuffer, sizeof(obuffer)); 869 866 co.UpdateInterval = clkUpdInd; 870 867 if (len1 > 0) { … … 876 873 co.NumberOfSat[CLOCKORBIT_SATSBAS] > 0 || 877 874 co.NumberOfSat[CLOCKORBIT_SATBDS] > 0 ) ? 1 : 0; 878 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GLONASSCLOCK, mmsg, obuffer, 879 sizeof(obuffer)); 875 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GLONASSCLOCK, mmsg, obuffer, sizeof(obuffer)); 880 876 if (len2 > 0) { 881 877 hlpBufferCo += QByteArray(obuffer, len2); … … 886 882 if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) { 887 883 co.UpdateInterval = ephUpdInd; 888 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GALILEOORBIT, 1, obuffer, 889 sizeof(obuffer)); 884 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GALILEOORBIT, 1, obuffer, sizeof(obuffer)); 890 885 co.UpdateInterval = clkUpdInd; 891 886 if (len1 > 0) { … … 896 891 co.NumberOfSat[CLOCKORBIT_SATSBAS] > 0 || 897 892 co.NumberOfSat[CLOCKORBIT_SATBDS] > 0 ) ? 1 : 0; 898 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GALILEOCLOCK, mmsg, obuffer, 899 sizeof(obuffer)); 893 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_GALILEOCLOCK, mmsg, obuffer, sizeof(obuffer)); 900 894 if (len2 > 0) { 901 895 hlpBufferCo += QByteArray(obuffer, len2); … … 906 900 if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) { 907 901 co.UpdateInterval = ephUpdInd; 908 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_QZSSORBIT, 1, obuffer, 909 sizeof(obuffer)); 902 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_QZSSORBIT, 1, obuffer, sizeof(obuffer)); 910 903 co.UpdateInterval = clkUpdInd; 911 904 if (len1 > 0) { … … 915 908 int mmsg = (co.NumberOfSat[CLOCKORBIT_SATSBAS] > 0 || 916 909 co.NumberOfSat[CLOCKORBIT_SATBDS] > 0 ) ? 1 : 0; 917 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_QZSSCLOCK, mmsg, obuffer, 918 sizeof(obuffer)); 910 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_QZSSCLOCK, mmsg, obuffer, sizeof(obuffer)); 919 911 if (len2 > 0) { 920 912 hlpBufferCo += QByteArray(obuffer, len2); … … 925 917 if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) { 926 918 co.UpdateInterval = ephUpdInd; 927 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_SBASORBIT, 1, obuffer, 928 sizeof(obuffer)); 919 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_SBASORBIT, 1, obuffer, sizeof(obuffer)); 929 920 co.UpdateInterval = clkUpdInd; 930 921 if (len1 > 0) { … … 943 934 if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) { 944 935 co.UpdateInterval = ephUpdInd; 945 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_BDSORBIT, 1, obuffer, 946 sizeof(obuffer)); 936 int len1 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_BDSORBIT, 1, obuffer, sizeof(obuffer)); 947 937 co.UpdateInterval = clkUpdInd; 948 938 if (len1 > 0) { … … 951 941 } 952 942 int mmsg = 0; 953 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_BDSCLOCK, mmsg, obuffer, 954 sizeof(obuffer)); 943 int len2 = _ssrCorr->MakeClockOrbit(&co, _ssrCorr->COTYPE_BDSCLOCK, mmsg, obuffer, sizeof(obuffer)); 955 944 if (len2 > 0) { 956 945 hlpBufferCo += QByteArray(obuffer, len2); -
trunk/BNC/src/upload/bncuploadcaster.cpp
r10221 r10227 163 163 if (_ntripVersion == "1") { 164 164 _outSocket->write(_outBuffer); 165 _outSocket->flush(); 165 166 } else { 166 167 QString chunkSize = QString("%1").arg(_outBuffer.size(), 0, 16, QLatin1Char('0')); 167 168 QByteArray chunkedData = chunkSize.toLatin1() + "\r\n" + _outBuffer + "\r\n"; 168 169 _outSocket->write(chunkedData); 170 _outSocket->flush(); 169 171 } 170 _outSocket->flush();171 172 emit newBytes(_mountpoint.toLatin1(), _outBuffer.size()); 172 173 }
Note:
See TracChangeset
for help on using the changeset viewer.