Discipline?

How do you discipline a 1.5 year old?? My son has started screaming and falling down when he's mad or upset. I don't want to spank, I have flicked his hand a few times.... I know he's frustrated because he's trying to communicate but how much do I let him get away with before disciplining him?