Fix issue 144

This commit is contained in:
Bi-Ruei, Chiu 2017-05-21 23:57:58 +08:00
parent 4021e4ba62
commit e68cc22100
9 changed files with 87 additions and 48 deletions

View File

@ -38,7 +38,7 @@ if test ! -f Makefile.am.sample ; then
exit 1 exit 1
fi fi
EXTRA_CFLAGS="-DJUNKTEST" EXTRA_CFLAGS="-DJUNKTEST -D_DEFAULT_SOURCE ${CFLAGS}"
test -f config.h && EXTRA_CFLAGS="-DHAVE_CONFIG_H ${EXTRA_CFLAGS}" test -f config.h && EXTRA_CFLAGS="-DHAVE_CONFIG_H ${EXTRA_CFLAGS}"
test -n "$TITLE" && EXTRA_CFLAGS="-DASN_CONVERTER_TITLE=\"$TITLE\" ${EXTRA_CFLAGS}" test -n "$TITLE" && EXTRA_CFLAGS="-DASN_CONVERTER_TITLE=\"$TITLE\" ${EXTRA_CFLAGS}"
@ -62,6 +62,7 @@ set +x
echo " ASN1MODULES=\"${ASN1MODULES}\" \\" echo " ASN1MODULES=\"${ASN1MODULES}\" \\"
echo " ASN1PDU=${ASN1PDU} \\" echo " ASN1PDU=${ASN1PDU} \\"
echo " PROGNAME=${PROGNAME} \\" echo " PROGNAME=${PROGNAME} \\"
echo " CFLAGS=\"${CFLAGS}\" \\"
echo " $0" echo " $0"
echo echo
echo 'check: ${TARGET} check-ber check-xer check-per' echo 'check: ${TARGET} check-ber check-xer check-per'

View File

@ -163,7 +163,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
# This file may be used as an input for make(3) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = ldap3dump TARGET = ldap3dump
CFLAGS += -DASN_CONVERTER_TITLE="Lightweight Directory Access Protocol V3 decoder" -DHAVE_CONFIG_H -DJUNKTEST -DPDU=LDAPMessage -I. CFLAGS += -DASN_CONVERTER_TITLE="Lightweight Directory Access Protocol V3 decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=LDAPMessage -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: LDAPMessage.c $(TARGET) all: LDAPMessage.c $(TARGET)
@ -198,6 +198,7 @@ regen-makefile:
ASN1MODULES="../rfc4511-Lightweight-Directory-Access-Protocol-V3.asn1" \ ASN1MODULES="../rfc4511-Lightweight-Directory-Access-Protocol-V3.asn1" \
ASN1PDU=LDAPMessage \ ASN1PDU=LDAPMessage \
PROGNAME=ldap3dump \ PROGNAME=ldap3dump \
CFLAGS="" \
../sample.makefile.regen ../sample.makefile.regen
check: ${TARGET} check-ber check-xer check-per check: ${TARGET} check-ber check-xer check-per

View File

@ -3578,7 +3578,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
# This file may be used as an input for make(3) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = lte-rrc-dump TARGET = lte-rrc-dump
CFLAGS += -DJUNKTEST -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I. CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: DL-DCCH-Message.c $(TARGET) all: DL-DCCH-Message.c $(TARGET)
@ -3612,6 +3612,7 @@ regen-makefile:
ASN1MODULES="../lte-rrc-14.2.1.asn1" \ ASN1MODULES="../lte-rrc-14.2.1.asn1" \
ASN1PDU=DL-DCCH-Message \ ASN1PDU=DL-DCCH-Message \
PROGNAME=lte-rrc-dump \ PROGNAME=lte-rrc-dump \
CFLAGS="" \
../sample.makefile.regen ../sample.makefile.regen
check: ${TARGET} check-ber check-xer check-per check: ${TARGET} check-ber check-xer check-per

View File

@ -285,7 +285,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
# This file may be used as an input for make(3) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = megaco-dump TARGET = megaco-dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -DPDU=MegacoMessage -I. CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=MegacoMessage -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: MegacoMessage.c $(TARGET) all: MegacoMessage.c $(TARGET)
@ -319,6 +319,7 @@ regen-makefile:
ASN1MODULES="../rfc3525-MEDIA-GATEWAY-CONTROL.asn1" \ ASN1MODULES="../rfc3525-MEDIA-GATEWAY-CONTROL.asn1" \
ASN1PDU=MegacoMessage \ ASN1PDU=MegacoMessage \
PROGNAME=megaco-dump \ PROGNAME=megaco-dump \
CFLAGS="" \
../sample.makefile.regen ../sample.makefile.regen
check: ${TARGET} check-ber check-xer check-per check: ${TARGET} check-ber check-xer check-per

View File

@ -186,8 +186,7 @@ ASN_MODULE_SOURCES= \
GenericBoolean.c \ GenericBoolean.c \
GenericOctetString.c \ GenericOctetString.c \
Colour.c \ Colour.c \
XYPosition.c \ XYPosition.c
OctetString.c
ASN_MODULE_HEADERS= \ ASN_MODULE_HEADERS= \
InterchangedObject.h \ InterchangedObject.h \
@ -377,19 +376,12 @@ ASN_MODULE_HEADERS= \
GenericBoolean.h \ GenericBoolean.h \
GenericOctetString.h \ GenericOctetString.h \
Colour.h \ Colour.h \
XYPosition.h \ XYPosition.h
OctetString.h
ASN_MODULE_HEADERS+=ANY.h
ASN_MODULE_SOURCES+=ANY.c
ASN_MODULE_HEADERS+=BOOLEAN.h ASN_MODULE_HEADERS+=BOOLEAN.h
ASN_MODULE_SOURCES+=BOOLEAN.c ASN_MODULE_SOURCES+=BOOLEAN.c
ASN_MODULE_HEADERS+=ENUMERATED.h
ASN_MODULE_SOURCES+=ENUMERATED.c
ASN_MODULE_HEADERS+=INTEGER.h ASN_MODULE_HEADERS+=INTEGER.h
ASN_MODULE_HEADERS+=NativeEnumerated.h ASN_MODULE_HEADERS+=NativeEnumerated.h
ASN_MODULE_HEADERS+=IA5String.h
ASN_MODULE_SOURCES+=IA5String.c
ASN_MODULE_SOURCES+=INTEGER.c ASN_MODULE_SOURCES+=INTEGER.c
ASN_MODULE_HEADERS+=NULL.h ASN_MODULE_HEADERS+=NULL.h
ASN_MODULE_SOURCES+=NULL.c ASN_MODULE_SOURCES+=NULL.c
@ -444,6 +436,8 @@ ASN_MODULE_HEADERS+=per_decoder.h
ASN_MODULE_SOURCES+=per_decoder.c ASN_MODULE_SOURCES+=per_decoder.c
ASN_MODULE_HEADERS+=per_encoder.h ASN_MODULE_HEADERS+=per_encoder.h
ASN_MODULE_SOURCES+=per_encoder.c ASN_MODULE_SOURCES+=per_encoder.c
ASN_MODULE_HEADERS+=per_opentype.h
ASN_MODULE_SOURCES+=per_opentype.c
ASN_CONVERTER_SOURCES+=converter-sample.c ASN_CONVERTER_SOURCES+=converter-sample.c
@ -453,7 +447,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
# This file may be used as an input for make(3) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = mheg5dump TARGET = mheg5dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -DPDU=InterchangedObject -I. CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=InterchangedObject -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: InterchangedObject.c $(TARGET) all: InterchangedObject.c $(TARGET)
@ -487,6 +481,7 @@ regen-makefile:
ASN1MODULES="../ISO13522-MHEG-5.asn" \ ASN1MODULES="../ISO13522-MHEG-5.asn" \
ASN1PDU=InterchangedObject \ ASN1PDU=InterchangedObject \
PROGNAME=mheg5dump \ PROGNAME=mheg5dump \
CFLAGS="" \
../sample.makefile.regen ../sample.makefile.regen
check: ${TARGET} check-ber check-xer check-per check: ${TARGET} check-ber check-xer check-per
@ -500,12 +495,12 @@ check-ber:
for b in 1 17 33 980 8192; do \ for b in 1 17 33 980 8192; do \
echo "Recoding $$f into XER and back ($$b)..."; \ echo "Recoding $$f into XER and back ($$b)..."; \
./${TARGET} -b $$b -iber -oxer $$f > ./.tmp.1.$$$$ || exit 2; \ ./${TARGET} -b $$b -iber -oxer $$f > ./.tmp.1.$$$$ || exit 2; \
./${TARGET} -b $$b -ixer -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 2; \ ./${TARGET} -b $$b -ixer -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 3; \
diff ./.tmp.1.$$$$ ./.tmp.2.$$$$ || exit 2; \ diff ./.tmp.1.$$$$ ./.tmp.2.$$$$ || exit 4; \
rm -f ./.tmp.[12].$$$$; \ rm -f ./.tmp.[12].$$$$; \
echo "Test junking $$f (please wait)..."; \ echo "Test junking $$f (please wait)..."; \
./${TARGET} -J0.0001 -n 1000 -b $$b -iber -onull $$f || exit 2; \ ./${TARGET} -J0.0001 -n 1000 -b $$b -iber -onull $$f || exit 5; \
./${TARGET} -J0.001 -n 1000 -b $$b -iber -onull $$f || exit 2; \ ./${TARGET} -J0.001 -n 1000 -b $$b -iber -onull $$f || exit 6; \
done; done; fi done; done; fi
check-xer: check-xer:
@ -514,41 +509,41 @@ check-xer:
for b in 1 17 33 980 8192; do \ for b in 1 17 33 980 8192; do \
echo "Recoding $$f into DER and back ($$b)..."; \ echo "Recoding $$f into DER and back ($$b)..."; \
./${TARGET} -b $$b -ixer -oder $$f > ./.tmp.1.$$$$ || exit 2; \ ./${TARGET} -b $$b -ixer -oder $$f > ./.tmp.1.$$$$ || exit 2; \
./${TARGET} -b $$b -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 2; \ ./${TARGET} -b $$b -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 3; \
diff $$f ./.tmp.2.$$$$ || exit 2; \ diff $$f ./.tmp.2.$$$$ || exit 4; \
rm -f ./.tmp.[12].$$$$; \ rm -f ./.tmp.[12].$$$$; \
echo "Test junking $$f (please wait)..."; \ echo "Test junking $$f (please wait)..."; \
./${TARGET} -J0.0001 -n 1000 -b $$b -ixer -onull $$f || exit 2; \ ./${TARGET} -J0.0001 -n 1000 -b $$b -ixer -onull $$f || exit 5; \
./${TARGET} -J0.001 -n 1000 -b $$b -ixer -onull $$f || exit 2; \ ./${TARGET} -J0.001 -n 1000 -b $$b -ixer -onull $$f || exit 6; \
done; done; fi done; done; fi
check-per: check-per:
@if test -f sample-InterchangedObject-1.per ; then \ @if test -f sample-InterchangedObject-1-nopad.per ; then \
for f in sample-InterchangedObject-[1-9].per; do \ for f in sample-InterchangedObject-[1-9]-nopad.per; do \
for b in 1 17 33 980 8192; do \ for b in 1 17 33 980 8192; do \
echo "Recoding $$f into DER into XER and back ($$b)..."; \ echo "Recoding non-padded $$f into DER into XER and back ($$b)..."; \
./${TARGET} -b $$b -iper -oder $$f > ./.tmp.1.$$$$ || exit 2; \ ./${TARGET} -b $$b -per-nopad -iper -oder $$f > ./.tmp.1.$$$$ || exit 2; \
./${TARGET} -b $$b -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 2; \ ./${TARGET} -b $$b -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 3; \
./${TARGET} -b $$b -ixer -oder ./.tmp.2.$$$$ > ./.tmp.3.$$$$ || exit 2; \ ./${TARGET} -b $$b -ixer -oder ./.tmp.2.$$$$ > ./.tmp.3.$$$$ || exit 4; \
diff ./.tmp.1.$$$$ ./.tmp.3.$$$$ || exit 2; \ diff ./.tmp.1.$$$$ ./.tmp.3.$$$$ || exit 5; \
rm -f ./.tmp.[123].$$$$; \ rm -f ./.tmp.[123].$$$$; \
echo "Test junking $$f (please wait)..."; \ echo "Test junking $$f (please wait)..."; \
./${TARGET} -J0.0001 -n 1000 -b $$b -iper -onull $$f || exit 2; \ ./${TARGET} -J0.0001 -n 1000 -b $$b -per-nopad -iper -onull $$f || exit 6; \
./${TARGET} -J0.001 -n 1000 -b $$b -iper -onull $$f || exit 2; \ ./${TARGET} -J0.001 -n 1000 -b $$b -per-nopad -iper -onull $$f || exit 7; \
done; done; fi done; done; fi
@if test -f sample-InterchangedObject-1-padded.per ; then \ @if test -f sample-InterchangedObject-1.per ; then \
for f in sample-*-[1-9]-padded.per; do \ for f in sample-*-[1-9].per; do \
pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \ pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \
for b in 1 17 33 980 8192; do \ for b in 1 17 33 980 8192; do \
echo "Recoding byte-padded $$f into DER into XER and back ($$b)..."; \ echo "Recoding $$f into DER into XER and back ($$b)..."; \
./${TARGET} -b $$b -per-padded -p $$pdu -iper -oder $$f > ./.tmp.1.$$$$ || exit 2; \ ./${TARGET} -b $$b -p $$pdu -iper -oder $$f > ./.tmp.1.$$$$ || exit 3; \
./${TARGET} -b $$b -p $$pdu -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 2; \ ./${TARGET} -b $$b -p $$pdu -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 4; \
./${TARGET} -b $$b -p $$pdu -ixer -oper ./.tmp.2.$$$$ > ./.tmp.1.$$$$ || exit 2; \ ./${TARGET} -b $$b -p $$pdu -ixer -oper ./.tmp.2.$$$$ > ./.tmp.1.$$$$ || exit 5; \
diff $$f ./.tmp.1.$$$$ || exit 2; \ diff $$f ./.tmp.1.$$$$ || exit 6; \
rm -f ./.tmp.[12].$$$$; \ rm -f ./.tmp.[12].$$$$; \
echo "Test junking $$f (please wait)..."; \ echo "Test junking $$f (please wait)..."; \
./${TARGET} -J0.0001 -n 1000 -b $$b -per-padded -iper -onull $$f || exit 2; \ ./${TARGET} -J0.0001 -n 1000 -b $$b -iper -onull $$f || exit 7; \
./${TARGET} -J0.001 -n 1000 -b $$b -per-padded -iper -onull $$f || exit 2; \ ./${TARGET} -J0.001 -n 1000 -b $$b -iper -onull $$f || exit 8; \
done; done; fi done; done; fi
distclean: clean distclean: clean

View File

@ -261,6 +261,8 @@ ASN_MODULE_SOURCES+=BMPString.c
ASN_MODULE_HEADERS+=UTF8String.h ASN_MODULE_HEADERS+=UTF8String.h
ASN_MODULE_HEADERS+=BOOLEAN.h ASN_MODULE_HEADERS+=BOOLEAN.h
ASN_MODULE_SOURCES+=BOOLEAN.c ASN_MODULE_SOURCES+=BOOLEAN.c
ASN_MODULE_HEADERS+=ENUMERATED.h
ASN_MODULE_SOURCES+=ENUMERATED.c
ASN_MODULE_HEADERS+=INTEGER.h ASN_MODULE_HEADERS+=INTEGER.h
ASN_MODULE_HEADERS+=NativeEnumerated.h ASN_MODULE_HEADERS+=NativeEnumerated.h
ASN_MODULE_HEADERS+=GeneralizedTime.h ASN_MODULE_HEADERS+=GeneralizedTime.h
@ -345,7 +347,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
# This file may be used as an input for make(3) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = x509dump TARGET = x509dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -DPDU=Certificate -I. CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=Certificate -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: Certificate.c $(TARGET) all: Certificate.c $(TARGET)
@ -366,7 +368,7 @@ clean:
regen: regenerate-from-asn1-source regen: regenerate-from-asn1-source
regenerate-from-asn1-source: regenerate-from-asn1-source:
../../asn1c/asn1c -S ../../skeletons -pdu=Certificate ../rfc3280-PKIX1Explicit88.asn1 ../rfc3280-PKIX1Implicit88.asn1 ../../asn1c/asn1c -S ../../skeletons -pdu=Certificate -fwide-types ../rfc3280-PKIX1Explicit88.asn1 ../rfc3280-PKIX1Implicit88.asn1
Certificate.c: ../sample.makefile.regen ../rfc3280-*.asn1 Certificate.c: ../sample.makefile.regen ../rfc3280-*.asn1
@ -379,6 +381,7 @@ regen-makefile:
ASN1MODULES="../rfc3280-*.asn1" \ ASN1MODULES="../rfc3280-*.asn1" \
ASN1PDU=Certificate \ ASN1PDU=Certificate \
PROGNAME=x509dump \ PROGNAME=x509dump \
CFLAGS="" \
../sample.makefile.regen ../sample.makefile.regen
check: ${TARGET} check-ber check-xer check-per check: ${TARGET} check-ber check-xer check-per

View File

@ -4740,7 +4740,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
# This file may be used as an input for make(3) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = rrc-dump TARGET = rrc-dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I. CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: DL-DCCH-Message.c $(TARGET) all: DL-DCCH-Message.c $(TARGET)
@ -4774,6 +4774,7 @@ regen-makefile:
ASN1MODULES="../rrc-7.1.0.asn1" \ ASN1MODULES="../rrc-7.1.0.asn1" \
ASN1PDU=DL-DCCH-Message \ ASN1PDU=DL-DCCH-Message \
PROGNAME=rrc-dump \ PROGNAME=rrc-dump \
CFLAGS="" \
../sample.makefile.regen ../sample.makefile.regen
check: ${TARGET} check-ber check-xer check-per check: ${TARGET} check-ber check-xer check-per

View File

@ -15,6 +15,8 @@ ASN_MODULE_SOURCES= \
GprsCall.c \ GprsCall.c \
ContentTransaction.c \ ContentTransaction.c \
LocationService.c \ LocationService.c \
MessagingEvent.c \
MobileSession.c \
AuditControlInfo.c \ AuditControlInfo.c \
AccessPointNameNI.c \ AccessPointNameNI.c \
AccessPointNameOI.c \ AccessPointNameOI.c \
@ -56,6 +58,7 @@ ASN_MODULE_SOURCES= \
ChargeDetailList.c \ ChargeDetailList.c \
ChargeDetailTimeStamp.c \ ChargeDetailTimeStamp.c \
ChargedItem.c \ ChargedItem.c \
ChargedParty.c \
ChargedPartyEquipment.c \ ChargedPartyEquipment.c \
ChargedPartyHomeIdentification.c \ ChargedPartyHomeIdentification.c \
ChargedPartyHomeIdList.c \ ChargedPartyHomeIdList.c \
@ -115,9 +118,12 @@ ASN_MODULE_SOURCES= \
DiscountValue.c \ DiscountValue.c \
DistanceChargeBandCode.c \ DistanceChargeBandCode.c \
EarliestCallTimeStamp.c \ EarliestCallTimeStamp.c \
ElementId.c \
ElementType.c \
EquipmentId.c \ EquipmentId.c \
EquipmentIdType.c \ EquipmentIdType.c \
Esn.c \ Esn.c \
EventReference.c \
ExchangeRate.c \ ExchangeRate.c \
ExchangeRateCode.c \ ExchangeRateCode.c \
FileAvailableTimeStamp.c \ FileAvailableTimeStamp.c \
@ -179,16 +185,23 @@ ASN_MODULE_SOURCES= \
MessageDescriptionInformation.c \ MessageDescriptionInformation.c \
MessageStatus.c \ MessageStatus.c \
MessageType.c \ MessageType.c \
MessagingEventService.c \
Min.c \ Min.c \
MinChargeableSubscriber.c \ MinChargeableSubscriber.c \
MoBasicCallInformation.c \ MoBasicCallInformation.c \
MobileSessionService.c \
Msisdn.c \ Msisdn.c \
MtBasicCallInformation.c \ MtBasicCallInformation.c \
NetworkAccessIdentifier.c \ NetworkAccessIdentifier.c \
NetworkElement.c \
NetworkElementList.c \
NetworkId.c \ NetworkId.c \
NetworkInitPDPContext.c \ NetworkInitPDPContext.c \
NetworkLocation.c \ NetworkLocation.c \
NonChargedNumber.c \ NonChargedNumber.c \
NonChargedParty.c \
NonChargedPartyNumber.c \
NonChargedPublicUserId.c \
NumberOfDecimalPlaces.c \ NumberOfDecimalPlaces.c \
ObjectType.c \ ObjectType.c \
OperatorSpecInfoList.c \ OperatorSpecInfoList.c \
@ -204,6 +217,7 @@ ASN_MODULE_SOURCES= \
PlmnId.c \ PlmnId.c \
PositioningMethod.c \ PositioningMethod.c \
PriorityCode.c \ PriorityCode.c \
PublicUserId.c \
RapFileSequenceNumber.c \ RapFileSequenceNumber.c \
RecEntityCode.c \ RecEntityCode.c \
RecEntityCodeList.c \ RecEntityCodeList.c \
@ -221,10 +235,13 @@ ASN_MODULE_SOURCES= \
ScuTimeStamps.c \ ScuTimeStamps.c \
ScuChargeableSubscriber.c \ ScuChargeableSubscriber.c \
Sender.c \ Sender.c \
ServiceStartTimestamp.c \
ServingBid.c \ ServingBid.c \
ServingLocationDescription.c \ ServingLocationDescription.c \
ServingNetwork.c \ ServingNetwork.c \
ServingPartiesInformation.c \ ServingPartiesInformation.c \
SessionChargeInfoList.c \
SessionChargeInformation.c \
SimChargeableSubscriber.c \ SimChargeableSubscriber.c \
SimToolkitIndicator.c \ SimToolkitIndicator.c \
SMSDestinationNumber.c \ SMSDestinationNumber.c \
@ -240,6 +257,7 @@ ASN_MODULE_SOURCES= \
Taxation.c \ Taxation.c \
TaxationList.c \ TaxationList.c \
TaxCode.c \ TaxCode.c \
TaxIndicator.c \
TaxInformation.c \ TaxInformation.c \
TaxInformationList.c \ TaxInformationList.c \
TaxRate.c \ TaxRate.c \
@ -324,6 +342,8 @@ ASN_MODULE_HEADERS= \
GprsCall.h \ GprsCall.h \
ContentTransaction.h \ ContentTransaction.h \
LocationService.h \ LocationService.h \
MessagingEvent.h \
MobileSession.h \
AuditControlInfo.h \ AuditControlInfo.h \
AccessPointNameNI.h \ AccessPointNameNI.h \
AccessPointNameOI.h \ AccessPointNameOI.h \
@ -365,6 +385,7 @@ ASN_MODULE_HEADERS= \
ChargeDetailList.h \ ChargeDetailList.h \
ChargeDetailTimeStamp.h \ ChargeDetailTimeStamp.h \
ChargedItem.h \ ChargedItem.h \
ChargedParty.h \
ChargedPartyEquipment.h \ ChargedPartyEquipment.h \
ChargedPartyHomeIdentification.h \ ChargedPartyHomeIdentification.h \
ChargedPartyHomeIdList.h \ ChargedPartyHomeIdList.h \
@ -424,9 +445,12 @@ ASN_MODULE_HEADERS= \
DiscountValue.h \ DiscountValue.h \
DistanceChargeBandCode.h \ DistanceChargeBandCode.h \
EarliestCallTimeStamp.h \ EarliestCallTimeStamp.h \
ElementId.h \
ElementType.h \
EquipmentId.h \ EquipmentId.h \
EquipmentIdType.h \ EquipmentIdType.h \
Esn.h \ Esn.h \
EventReference.h \
ExchangeRate.h \ ExchangeRate.h \
ExchangeRateCode.h \ ExchangeRateCode.h \
FileAvailableTimeStamp.h \ FileAvailableTimeStamp.h \
@ -488,16 +512,23 @@ ASN_MODULE_HEADERS= \
MessageDescriptionInformation.h \ MessageDescriptionInformation.h \
MessageStatus.h \ MessageStatus.h \
MessageType.h \ MessageType.h \
MessagingEventService.h \
Min.h \ Min.h \
MinChargeableSubscriber.h \ MinChargeableSubscriber.h \
MoBasicCallInformation.h \ MoBasicCallInformation.h \
MobileSessionService.h \
Msisdn.h \ Msisdn.h \
MtBasicCallInformation.h \ MtBasicCallInformation.h \
NetworkAccessIdentifier.h \ NetworkAccessIdentifier.h \
NetworkElement.h \
NetworkElementList.h \
NetworkId.h \ NetworkId.h \
NetworkInitPDPContext.h \ NetworkInitPDPContext.h \
NetworkLocation.h \ NetworkLocation.h \
NonChargedNumber.h \ NonChargedNumber.h \
NonChargedParty.h \
NonChargedPartyNumber.h \
NonChargedPublicUserId.h \
NumberOfDecimalPlaces.h \ NumberOfDecimalPlaces.h \
ObjectType.h \ ObjectType.h \
OperatorSpecInfoList.h \ OperatorSpecInfoList.h \
@ -513,6 +544,7 @@ ASN_MODULE_HEADERS= \
PlmnId.h \ PlmnId.h \
PositioningMethod.h \ PositioningMethod.h \
PriorityCode.h \ PriorityCode.h \
PublicUserId.h \
RapFileSequenceNumber.h \ RapFileSequenceNumber.h \
RecEntityCode.h \ RecEntityCode.h \
RecEntityCodeList.h \ RecEntityCodeList.h \
@ -530,10 +562,13 @@ ASN_MODULE_HEADERS= \
ScuTimeStamps.h \ ScuTimeStamps.h \
ScuChargeableSubscriber.h \ ScuChargeableSubscriber.h \
Sender.h \ Sender.h \
ServiceStartTimestamp.h \
ServingBid.h \ ServingBid.h \
ServingLocationDescription.h \ ServingLocationDescription.h \
ServingNetwork.h \ ServingNetwork.h \
ServingPartiesInformation.h \ ServingPartiesInformation.h \
SessionChargeInfoList.h \
SessionChargeInformation.h \
SimChargeableSubscriber.h \ SimChargeableSubscriber.h \
SimToolkitIndicator.h \ SimToolkitIndicator.h \
SMSDestinationNumber.h \ SMSDestinationNumber.h \
@ -549,6 +584,7 @@ ASN_MODULE_HEADERS= \
Taxation.h \ Taxation.h \
TaxationList.h \ TaxationList.h \
TaxCode.h \ TaxCode.h \
TaxIndicator.h \
TaxInformation.h \ TaxInformation.h \
TaxInformationList.h \ TaxInformationList.h \
TaxRate.h \ TaxRate.h \
@ -618,8 +654,6 @@ ASN_MODULE_HEADERS= \
ASN_MODULE_HEADERS+=INTEGER.h ASN_MODULE_HEADERS+=INTEGER.h
ASN_MODULE_HEADERS+=NativeEnumerated.h ASN_MODULE_HEADERS+=NativeEnumerated.h
ASN_MODULE_HEADERS+=IA5String.h
ASN_MODULE_SOURCES+=IA5String.c
ASN_MODULE_SOURCES+=INTEGER.c ASN_MODULE_SOURCES+=INTEGER.c
ASN_MODULE_SOURCES+=NativeEnumerated.c ASN_MODULE_SOURCES+=NativeEnumerated.c
ASN_MODULE_HEADERS+=NativeInteger.h ASN_MODULE_HEADERS+=NativeInteger.h
@ -681,7 +715,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
# This file may be used as an input for make(3) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = tap3dump TARGET = tap3dump
CFLAGS += -DASN_CONVERTER_TITLE="GSM TAP3 (Transferred Account Procedure, Version 3) decoder" -DHAVE_CONFIG_H -DJUNKTEST -DPDU=DataInterChange -I. CFLAGS += -DASN_CONVERTER_TITLE="GSM TAP3 (Transferred Account Procedure, Version 3) decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=DataInterChange -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: DataInterChange.c $(TARGET) all: DataInterChange.c $(TARGET)
@ -716,6 +750,7 @@ regen-makefile:
ASN1MODULES="../tap3.asn1" \ ASN1MODULES="../tap3.asn1" \
ASN1PDU=DataInterChange \ ASN1PDU=DataInterChange \
PROGNAME=tap3dump \ PROGNAME=tap3dump \
CFLAGS="" \
../sample.makefile.regen ../sample.makefile.regen
check: ${TARGET} check-ber check-xer check-per check: ${TARGET} check-ber check-xer check-per

View File

@ -234,7 +234,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
# This file may be used as an input for make(3) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = ulp-dump TARGET = ulp-dump
CFLAGS += -DASN_CONVERTER_TITLE="OMA UserPlane Location Protocol decoder" -DHAVE_CONFIG_H -DJUNKTEST -DPDU=ULP_PDU -DASN_PDU_COLLECTION -I. CFLAGS += -DASN_CONVERTER_TITLE="OMA UserPlane Location Protocol decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=ULP_PDU -DASN_PDU_COLLECTION -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: ULP-PDU.c $(TARGET) all: ULP-PDU.c $(TARGET)
@ -269,6 +269,7 @@ regen-makefile:
ASN1MODULES="../ulp.asn1" \ ASN1MODULES="../ulp.asn1" \
ASN1PDU=ULP-PDU \ ASN1PDU=ULP-PDU \
PROGNAME=ulp-dump \ PROGNAME=ulp-dump \
CFLAGS="" \
../sample.makefile.regen ../sample.makefile.regen
check: ${TARGET} check-ber check-xer check-per check: ${TARGET} check-ber check-xer check-per